Skip to content

F
ffmpeg.wasm-core
Commit 5a969f64 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

jack: Drop support for old (2012) JACK versions

parent 1bd986ed
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
configure
View file @ 5a969f64
...@@ -1638,7 +1638,6 @@ SYSTEM_FUNCS=" ...@@ -1638,7 +1638,6 @@ SYSTEM_FUNCS="
gmtime_r gmtime_r
inet_aton inet_aton
isatty isatty
jack_port_get_latency_range
LoadLibrary LoadLibrary
localtime_r localtime_r
mach_absolute_time mach_absolute_time
...@@ -4835,10 +4834,8 @@ check_header soundcard.h ...@@ -4835,10 +4834,8 @@ check_header soundcard.h
enabled_any alsa_indev alsa_outdev && enabled_any alsa_indev alsa_outdev &&
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
if enabled libjack; then enabled libjack &&
check_pkg_config libjack jack jack/jack.h jack_port_get_latency_range || require_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_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio
......
libavdevice/jack.c
View file @ 5a969f64
...@@ -93,13 +93,9 @@ static int process_callback(jack_nframes_t nframes, void *arg) ...@@ -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 */ /* Copy and interleave audio data from the JACK buffer into the packet */
for (i = 0; i < self->nports; i++) { for (i = 0; i < self->nports; i++) {
#if HAVE_JACK_PORT_GET_LATENCY_RANGE
jack_latency_range_t range; jack_latency_range_t range;
jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range); jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range);
latency += range.max; 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); buffer = jack_port_get_buffer(self->ports[i], self->buffer_size);
for (j = 0; j < self->buffer_size; j++) for (j = 0; j < self->buffer_size; j++)
pkt_data[j * self->nports + i] = buffer[j]; pkt_data[j * self->nports + i] = buffer[j];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment