jack: Fix build with jack 0.120.1

9544622674c0d0a3147a9b51145159b02eec68e9 checked
for 0.120.2 and later, but the deprecation was introduced in
0.120.1

diff --git a/configure.ac b/configure.ac
index 2456149..548ed5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -768,9 +768,9 @@ AG_GST_CHECK_FEATURE(JACK, Jack, jack, [
   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_2, jack >= 0.120.2 jack < 1.0)
-  if test x$HAVE_JACK_0_120_2 = xyes; then
-    AC_DEFINE(HAVE_JACK_0_120_2, 1, [defined if jack >= 0.120.2 is available])
+  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
+    AC_DEFINE(HAVE_JACK_0_120_1, 1, [defined if jack >= 0.120.1 is available])
   fi
 
 ])

diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
index 13f69b7..da1c4ac 100644 (file)
--- a/ext/jack/gstjackaudiosink.c
+++ b/ext/jack/gstjackaudiosink.c
@@ -593,7 +593,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
 {
   GstJackAudioSink *sink;
   guint i, res = 0;
-#ifdef HAVE_JACK_0_120_2
+#ifdef HAVE_JACK_0_120_1
   jack_latency_range_t range;
 #else
   guint latency;
@@ -604,7 +604,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
   client = gst_jack_audio_client_get_client (sink->client);
 
   for (i = 0; i < sink->port_count; i++) {
-#ifdef HAVE_JACK_0_120_2
+#ifdef HAVE_JACK_0_120_1
     jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range);
     if (range.max > res)
       res = range.max;

diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
index b484057..68d11f8 100644 (file)
--- a/ext/jack/gstjackaudiosrc.c
+++ b/ext/jack/gstjackaudiosrc.c
@@ -604,7 +604,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
 {
   GstJackAudioSrc *src;
   guint i, res = 0;
-#ifdef HAVE_JACK_0_120_2
+#ifdef HAVE_JACK_0_120_1
   jack_latency_range_t range;
 #else
   guint latency;
@@ -615,7 +615,7 @@ gst_jack_ring_buffer_delay (GstRingBuffer * buf)
   client = gst_jack_audio_client_get_client (src->client);
 
   for (i = 0; i < src->port_count; i++) {
-#ifdef HAVE_JACK_0_120_2
+#ifdef HAVE_JACK_0_120_1
     jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range);
     if (range.max > res)
       res = range.max;