pulsesink: Only use gst_audio_clock_new() when compiling against newer base

diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c
index 760bd3ecb560909fbf4cd44e991c6fd7cbda2e61..be5b5367972b07c034c4cd361e922f552fcb07ab 100644 (file)
--- a/ext/pulse/pulsemixerctrl.c
+++ b/ext/pulse/pulsemixerctrl.c
@@ -91,7 +91,7 @@ gst_pulsemixer_ctrl_sink_info_cb (pa_context * context, const pa_sink_info * i,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = !!i->mute;
+  c->muted = ! !i->mute;
   c->type = GST_PULSEMIXER_SINK;
 
   if (c->track) {
@@ -141,7 +141,7 @@ gst_pulsemixer_ctrl_source_info_cb (pa_context * context,
   c->index = i->index;
   c->channel_map = i->channel_map;
   c->volume = i->volume;
-  c->muted = !!i->mute;
+  c->muted = ! !i->mute;
   c->type = GST_PULSEMIXER_SOURCE;
 
   if (c->track) {
@@ -195,7 +195,7 @@ gst_pulsemixer_ctrl_success_cb (pa_context * context, int success,
 {
   GstPulseMixerCtrl *c = (GstPulseMixerCtrl *) userdata;
 
-  c->operation_success = !!success;
+  c->operation_success = ! !success;
   pa_threaded_mainloop_signal (c->mainloop, 0);
 }
 

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 5d676169d3ab1e95155eaa7ae28719b54321ac2d..32b32d4e018734dba2f037e5eb5cc25acbce6a72 100644 (file)
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -2503,10 +2503,16 @@ 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)
       GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
           gst_audio_clock_new_full ("GstPulseSinkClock",
           (GstAudioClockGetTimeFunc) gst_pulsesink_get_time,
           gst_object_ref (pulsesink), (GDestroyNotify) gst_object_unref);
+#else
+      GST_BASE_AUDIO_SINK (pulsesink)->provided_clock =
+          gst_audio_clock_new ("GstPulseSinkClock",
+          (GstAudioClockGetTimeFunc) gst_pulsesink_get_time, pulsesink);
+#endif
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       gst_element_post_message (element,

diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c
index 1578d869331e9eac23d1a11520b5e49200187c5a..9765b5c7d2013bea71f6cd103b90f6ea8d3f3eb0 100644 (file)
--- a/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@ -1028,7 +1028,7 @@ gst_pulsesrc_success_cb (pa_stream * s, int success, void *userdata)
 {
   GstPulseSrc *pulsesrc = GST_PULSESRC_CAST (userdata);
 
-  pulsesrc->operation_success = !!success;
+  pulsesrc->operation_success = ! !success;
   pa_threaded_mainloop_signal (pulsesrc->mainloop, 0);
 }