From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Mon, 26 Jul 2010 16:15:25 +0000 (+0200)
Subject: pulsesink: correctly check what version of gst-plugins-base we're compiling against
X-Git-Tag: RELEASE-0.10.25~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7055264e2e111a0a278c7023bd989e59426abaab;p=platform%2Fupstream%2Fgst-plugins-good.git

pulsesink: correctly check what version of gst-plugins-base we're compiling against

We need to check the gst-plugins-base version, not the core version
(even if both should be the same in any sane setup).
---

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 32b32d4..eda0454 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -51,6 +51,8 @@
 #include <gst/interfaces/streamvolume.h>
 #include <gst/gst-i18n-plugin.h>
 
+#include <gst/pbutils/pbutils.h>        /* only used for GST_PLUGINS_BASE_VERSION_* */
+
 #include "pulsesink.h"
 #include "pulseutil.h"
 
@@ -2503,7 +2505,10 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
       /* override with a custom clock */
       if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
         gst_object_unref (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock);
-#if GST_CHECK_VERSION(0, 10, 31) || (GST_CHECK_VERSION(0, 10, 30) && GST_VERSION_NANO > 0)
+
+/* FIXME: get rid once we can depend on core/base git again (>= 0.10.30.1)
+ * (and the pbutils include above as well) */
+#if defined(GST_PLUGINS_BASE_VERSION_MAJOR)
       GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
           gst_audio_clock_new_full ("GstPulseSinkClock",
           (GstAudioClockGetTimeFunc) gst_pulsesink_get_time,