mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

jack: Fix build with jack 0.120.1

Browse source 
9544622674 checked
for 0.120.2 and later, but the deprecation was introduced in
0.120.1
This commit is contained in:
Jon Nordby 2011-04-05 09:44:01 +02:00 committed by Stefan Kost
parent 270dd376bc
commit d68dd46084
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -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
])

4
ext/jack/gstjackaudiosink.c
View file

@ -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;

4
ext/jack/gstjackaudiosrc.c
View file

@ -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;