From: Arun Raghavan <arun.raghavan@collabora.co.uk>
Date: Thu, 13 Jun 2013 08:53:08 +0000 (+0530)
Subject: Revert "pulsesink: Make 2.0 dependency optional"
X-Git-Tag: 1.19.3~509^2~5701
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7486e2fc5375fea339e1f90db52827bad4e2a2a9;p=platform%2Fupstream%2Fgstreamer.git

Revert "pulsesink: Make 2.0 dependency optional"

This reverts commit 01457027e0d384aca3e551ae684e0aa074ee5498.

We'll just depend on PulseAudio 2.0 or above instead of having the bug
partially fixed based on the installed libpulse version.
---

diff --git a/configure.ac b/configure.ac
index e599a71..8f398c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 ***
diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index a7008ad..cd257d6 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -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;
diff --git a/ext/pulse/pulseutil.c b/ext/pulse/pulseutil.c
index b8abf00..a232c6e 100644
--- a/ext/pulse/pulseutil.c
+++ b/ext/pulse/pulseutil.c
@@ -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