jack: Drop support for old (2012) JACK versions

diff --git a/configure b/configure
index 2d84700fc7d1bf7faa28e541ad97c874607425d4..f1488cf4943aa15ad30e915b2824136977456d00 100755 (executable)
--- a/configure
+++ b/configure
@@ -1638,7 +1638,6 @@ SYSTEM_FUNCS="
     gmtime_r
     inet_aton
     isatty
-    jack_port_get_latency_range
     LoadLibrary
     localtime_r
     mach_absolute_time
@@ -4835,10 +4834,8 @@ check_header soundcard.h
 enabled_any alsa_indev alsa_outdev &&
     check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
 
-if enabled libjack; then
-    check_pkg_config libjack jack jack/jack.h jack_port_get_latency_range ||
-    require_pkg_config libjack jack jack/jack.h jack_client_open
-fi
+enabled libjack &&
+    require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
 
 enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio
 

diff --git a/libavdevice/jack.c b/libavdevice/jack.c
index 0b4deee01cf32670318d4a8496670b81b2eabf58..c31c4ce5b3e233bac31c7115b38bc2142809ef7b 100644 (file)
--- a/libavdevice/jack.c
+++ b/libavdevice/jack.c
@@ -93,13 +93,9 @@ static int process_callback(jack_nframes_t nframes, void *arg)
 
     /* Copy and interleave audio data from the JACK buffer into the packet */
     for (i = 0; i < self->nports; i++) {
-    #if HAVE_JACK_PORT_GET_LATENCY_RANGE
         jack_latency_range_t range;
         jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range);
         latency += range.max;
-    #else
-        latency += jack_port_get_total_latency(self->client, self->ports[i]);
-    #endif
         buffer = jack_port_get_buffer(self->ports[i], self->buffer_size);
         for (j = 0; j < self->buffer_size; j++)
             pkt_data[j * self->nports + i] = buffer[j];