mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesink: Make 2.0 dependency optional

Browse source 
The getcaps function we added uses some pa_format_info_get_prop...
accessor functions that were only added in 2.0, so we only have our
getcaps implementation exist if we're compiling against libpulse 2.0 or
above.

Eventually, we could bump the minimum requirement to 2.0 or above.

https://bugzilla.gnome.org/show_bug.cgi?id=686459
This commit is contained in:
Arun Raghavan 2013-06-13 12:40:15 +05:30
parent 01cc493944
commit 01457027e0
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -813,6 +813,11 @@ AG_GST_CHECK_FEATURE(PULSE, [pulseaudio plug-in], pulseaudio, [
AC_CHECK_HEADERS([process.h]) AC_CHECK_HEADERS([process.h])
AG_GST_PKG_CHECK_MODULES(PULSE, libpulse >= 1.0) AG_GST_PKG_CHECK_MODULES(PULSE, libpulse >= 1.0)
AG_GST_PKG_CHECK_MODULES(PULSE_2_0, libpulse >= 2.0)
if test x$HAVE_PULSE_2_0 = xyes; then
AC_DEFINE(HAVE_PULSE_2_0, 1, [defined if pulseaudio >= 2.0 is available])
fi
]) ])
dnl *** dv1394 *** dnl *** dv1394 ***

6
ext/pulse/pulsesink.c
View file

@ -2016,6 +2016,7 @@ done:
pa_threaded_mainloop_signal (mainloop, 0); pa_threaded_mainloop_signal (mainloop, 0);
} }
#ifdef HAVE_PULSE_2_0
static gboolean static gboolean
gst_pulse_format_info_int_prop_to_value (pa_format_info * format, gst_pulse_format_info_int_prop_to_value (pa_format_info * format,
const char *key, GValue * value) const char *key, GValue * value)
@ -2125,6 +2126,7 @@ gst_pulse_format_info_to_caps (pa_format_info * format)
out: out:
return ret; return ret;
} }
#endif
/* Call with mainloop lock held */ /* Call with mainloop lock held */
static pa_stream * static pa_stream *
@ -2162,6 +2164,7 @@ error:
return NULL; return NULL;
} }
#ifdef HAVE_PULSE_2_0
static GstCaps * static GstCaps *
gst_pulsesink_query_getcaps (GstPulseSink * psink, GstCaps * filter) gst_pulsesink_query_getcaps (GstPulseSink * psink, GstCaps * filter)
{ {
@ -2274,6 +2277,7 @@ info_failed:
goto unlock; goto unlock;
} }
} }
#endif
static gboolean static gboolean
gst_pulsesink_query_acceptcaps (GstPulseSink * psink, GstCaps * caps) gst_pulsesink_query_acceptcaps (GstPulseSink * psink, GstCaps * caps)
@ -3125,6 +3129,7 @@ gst_pulsesink_query (GstBaseSink * sink, GstQuery * query)
gboolean ret; gboolean ret;
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
#ifdef HAVE_PULSE_2_0
case GST_QUERY_CAPS: case GST_QUERY_CAPS:
{ {
GstCaps *caps, *filter; GstCaps *caps, *filter;
@ -3140,6 +3145,7 @@ gst_pulsesink_query (GstBaseSink * sink, GstQuery * query)
return FALSE; return FALSE;
} }
} }
#endif
case GST_QUERY_ACCEPT_CAPS: case GST_QUERY_ACCEPT_CAPS:
{ {
GstCaps *caps; GstCaps *caps;

2
ext/pulse/pulseutil.c
View file

@ -191,6 +191,7 @@ fail:
return FALSE; return FALSE;
} }
#ifdef HAVE_PULSE_2_0
const char * const char *
gst_pulse_sample_format_to_caps_format (pa_sample_format_t sf) gst_pulse_sample_format_to_caps_format (pa_sample_format_t sf)
{ {
@ -232,6 +233,7 @@ gst_pulse_sample_format_to_caps_format (pa_sample_format_t sf)
return NULL; return NULL;
} }
} }
#endif
/* PATH_MAX is not defined everywhere, e.g. on GNU Hurd */ /* PATH_MAX is not defined everywhere, e.g. on GNU Hurd */
#ifndef PATH_MAX #ifndef PATH_MAX