mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
We need to check the gst-plugins-base version, not the core version
(even if both should be the same in any sane setup).
This commit is contained in:
Tim-Philipp Müller 2010-07-26 18:15:25 +02:00
parent c6f47c34fb
commit 7055264e2e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/pulse/pulsesink.c
View file

@ -51,6 +51,8 @@
#include <gst/interfaces/streamvolume.h> #include <gst/interfaces/streamvolume.h>
#include <gst/gst-i18n-plugin.h> #include <gst/gst-i18n-plugin.h>
#include <gst/pbutils/pbutils.h> /* only used for GST_PLUGINS_BASE_VERSION_* */
#include "pulsesink.h" #include "pulsesink.h"
#include "pulseutil.h" #include "pulseutil.h"
@ -2503,7 +2505,10 @@ gst_pulsesink_change_state (GstElement * element, GstStateChange transition)
/* override with a custom clock */ /* override with a custom clock */
if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock) if (GST_BASE_AUDIO_SINK (pulsesink)->provided_clock)
gst_object_unref (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_BASE_AUDIO_SINK (pulsesink)->provided_clock =
gst_audio_clock_new_full ("GstPulseSinkClock", gst_audio_clock_new_full ("GstPulseSinkClock",
(GstAudioClockGetTimeFunc) gst_pulsesink_get_time, (GstAudioClockGetTimeFunc) gst_pulsesink_get_time,