mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

jack: also handle deprecations for jack 1.9.7

Browse source 
Jack 1.9.7 was released 20.Mar.2011, need to handle the deprecated api for this
version too.
This commit is contained in:
Stefan Kost 2011-04-11 12:44:19 +03:00
parent b541208b77
commit 21a688ce25
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -768,11 +768,14 @@ AG_GST_CHECK_FEATURE(JACK, Jack, jack, [
AC_SUBST(JACK_CFLAGS) AC_SUBST(JACK_CFLAGS)
AC_SUBST(JACK_LIBS) AC_SUBST(JACK_LIBS)
dnl upcomming jack2 (1.9.7 will have the new api as well
AG_GST_PKG_CHECK_MODULES(JACK_0_120_1, jack >= 0.120.1 jack < 1.0) AG_GST_PKG_CHECK_MODULES(JACK_0_120_1, jack >= 0.120.1 jack < 1.0)
if test x$HAVE_JACK_0_120_1 = xyes; then if test x$HAVE_JACK_0_120_1 = xyes; then
AC_DEFINE(HAVE_JACK_0_120_1, 1, [defined if jack >= 0.120.1 is available]) AC_DEFINE(HAVE_JACK_0_120_1, 1, [defined if jack >= 0.120.1 is available])
fi fi
AG_GST_PKG_CHECK_MODULES(JACK_1_9_7, jack >= 1.9.7)
if test x$HAVE_JACK_1_9_7 = xyes; then
AC_DEFINE(HAVE_JACK_1_9_7, 1, [defined if jack >= 1.9.7 is available])
fi
]) ])

4
ext/jack/gstjackaudiosink.c
View file

@ -593,7 +593,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
{ {
GstJackAudioSink *sink; GstJackAudioSink *sink;
guint i, res = 0; guint i, res = 0;
#ifdef HAVE_JACK_0_120_1 #if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
jack_latency_range_t range; jack_latency_range_t range;
#else #else
guint latency; guint latency;
@ -604,7 +604,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
client = gst_jack_audio_client_get_client (sink->client); client = gst_jack_audio_client_get_client (sink->client);
for (i = 0; i < sink->port_count; i++) { for (i = 0; i < sink->port_count; i++) {
#ifdef HAVE_JACK_0_120_1 #if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range); jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range);
if (range.max > res) if (range.max > res)
res = range.max; res = range.max;

4
ext/jack/gstjackaudiosrc.c
View file

@ -604,7 +604,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
{ {
GstJackAudioSrc *src; GstJackAudioSrc *src;
guint i, res = 0; guint i, res = 0;
#ifdef HAVE_JACK_0_120_1 #if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
jack_latency_range_t range; jack_latency_range_t range;
#else #else
guint latency; guint latency;
@ -615,7 +615,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
client = gst_jack_audio_client_get_client (src->client); client = gst_jack_audio_client_get_client (src->client);
for (i = 0; i < src->port_count; i++) { for (i = 0; i < src->port_count; i++) {
#ifdef HAVE_JACK_0_120_1 #if defined (HAVE_JACK_0_120_1) || defined(HAVE_JACK_1_9_7)
jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range); jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range);
if (range.max > res) if (range.max > res)
res = range.max; res = range.max;