mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

jack: fix build against jack 0.120.2

Browse source 
jack_port_get_total_latency() has been deprecated in favor of
jack_port_get_latency_range().

https://bugzilla.gnome.org/show_bug.cgi?id=644477
This commit is contained in:
Philippe Normand 2011-03-11 10:29:08 +01:00 committed by Tim-Philipp Müller
parent 32afdea96d
commit 9544622674
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -766,6 +766,12 @@ AG_GST_CHECK_FEATURE(JACK, Jack, jack, [
PKG_CHECK_MODULES(JACK, jack >= 0.99.10, HAVE_JACK="yes", HAVE_JACK="no") PKG_CHECK_MODULES(JACK, jack >= 0.99.10, HAVE_JACK="yes", HAVE_JACK="no")
AC_SUBST(JACK_CFLAGS) AC_SUBST(JACK_CFLAGS)
AC_SUBST(JACK_LIBS) AC_SUBST(JACK_LIBS)
AG_GST_PKG_CHECK_MODULES(JACK_0_120_2, jack >= 0.120.2)
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])
fi
]) ])
dnl *** jpeg *** dnl *** jpeg ***

15
ext/jack/gstjackaudiosink.c
View file

@ -592,16 +592,27 @@ static guint
gst_jack_ring_buffer_delay (GstRingBuffer * buf) gst_jack_ring_buffer_delay (GstRingBuffer * buf)
{ {
GstJackAudioSink *sink; GstJackAudioSink *sink;
guint i, res = 0, latency; guint i, res = 0;
#ifdef HAVE_JACK_0_120_2
jack_latency_range_t range;
#else
guint latency;
#endif
jack_client_t *client; jack_client_t *client;
sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (buf)); sink = GST_JACK_AUDIO_SINK (GST_OBJECT_PARENT (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++) {
latency = jack_port_get_total_latency (client, sink->ports[i]); #ifdef HAVE_JACK_0_120_2
jack_port_get_latency_range (sink->ports[i], JackPlaybackLatency, &range);
if (range.max > res)
res = range.max;
#else
latency = jack_port_get_total_latency (client, src->ports[i]);
if (latency > res) if (latency > res)
res = latency; res = latency;
#endif
} }
GST_LOG_OBJECT (sink, "delay %u", res); GST_LOG_OBJECT (sink, "delay %u", res);

13
ext/jack/gstjackaudiosrc.c
View file

@ -603,16 +603,27 @@ static guint
gst_jack_ring_buffer_delay (GstRingBuffer * buf) gst_jack_ring_buffer_delay (GstRingBuffer * buf)
{ {
GstJackAudioSrc *src; GstJackAudioSrc *src;
guint i, res = 0, latency; guint i, res = 0;
#ifdef HAVE_JACK_0_120_2
jack_latency_range_t range;
#else
guint latency;
#endif
jack_client_t *client; jack_client_t *client;
src = GST_JACK_AUDIO_SRC (GST_OBJECT_PARENT (buf)); src = GST_JACK_AUDIO_SRC (GST_OBJECT_PARENT (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_2
jack_port_get_latency_range (src->ports[i], JackCaptureLatency, &range);
if (range.max > res)
res = range.max;
#else
latency = jack_port_get_total_latency (client, src->ports[i]); latency = jack_port_get_total_latency (client, src->ports[i]);
if (latency > res) if (latency > res)
res = latency; res = latency;
#endif
} }
GST_DEBUG_OBJECT (src, "delay %u", res); GST_DEBUG_OBJECT (src, "delay %u", res);