From 7055264e2e111a0a278c7023bd989e59426abaab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 26 Jul 2010 18:15:25 +0200 Subject: [PATCH] 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). --- ext/pulse/pulsesink.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 #include +#include /* 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, -- 2.7.4