mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-21 15:56:42 +00:00
Revert "pulsesink: Make 2.0 dependency optional"
This reverts commit 01457027e0
.
We'll just depend on PulseAudio 2.0 or above instead of having the bug
partially fixed based on the installed libpulse version.
This commit is contained in:
parent
01457027e0
commit
7486e2fc53
3 changed files with 0 additions and 13 deletions
|
@ -813,11 +813,6 @@ AG_GST_CHECK_FEATURE(PULSE, [pulseaudio plug-in], pulseaudio, [
|
|||
AC_CHECK_HEADERS([process.h])
|
||||
|
||||
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 ***
|
||||
|
|
|
@ -2016,7 +2016,6 @@ done:
|
|||
pa_threaded_mainloop_signal (mainloop, 0);
|
||||
}
|
||||
|
||||
#ifdef HAVE_PULSE_2_0
|
||||
static gboolean
|
||||
gst_pulse_format_info_int_prop_to_value (pa_format_info * format,
|
||||
const char *key, GValue * value)
|
||||
|
@ -2126,7 +2125,6 @@ gst_pulse_format_info_to_caps (pa_format_info * format)
|
|||
out:
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Call with mainloop lock held */
|
||||
static pa_stream *
|
||||
|
@ -2164,7 +2162,6 @@ error:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef HAVE_PULSE_2_0
|
||||
static GstCaps *
|
||||
gst_pulsesink_query_getcaps (GstPulseSink * psink, GstCaps * filter)
|
||||
{
|
||||
|
@ -2277,7 +2274,6 @@ info_failed:
|
|||
goto unlock;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static gboolean
|
||||
gst_pulsesink_query_acceptcaps (GstPulseSink * psink, GstCaps * caps)
|
||||
|
@ -3129,7 +3125,6 @@ gst_pulsesink_query (GstBaseSink * sink, GstQuery * query)
|
|||
gboolean ret;
|
||||
|
||||
switch (GST_QUERY_TYPE (query)) {
|
||||
#ifdef HAVE_PULSE_2_0
|
||||
case GST_QUERY_CAPS:
|
||||
{
|
||||
GstCaps *caps, *filter;
|
||||
|
@ -3145,7 +3140,6 @@ gst_pulsesink_query (GstBaseSink * sink, GstQuery * query)
|
|||
return FALSE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
case GST_QUERY_ACCEPT_CAPS:
|
||||
{
|
||||
GstCaps *caps;
|
||||
|
|
|
@ -191,7 +191,6 @@ fail:
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef HAVE_PULSE_2_0
|
||||
const char *
|
||||
gst_pulse_sample_format_to_caps_format (pa_sample_format_t sf)
|
||||
{
|
||||
|
@ -233,7 +232,6 @@ gst_pulse_sample_format_to_caps_format (pa_sample_format_t sf)
|
|||
return NULL;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* PATH_MAX is not defined everywhere, e.g. on GNU Hurd */
|
||||
#ifndef PATH_MAX
|
||||
|
|
Loading…
Reference in a new issue