diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-07-16 17:53:55 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-07-16 17:53:55 +0200 |
| commit | 10424a4064f7ec27441444010cccf9e90378c438 (patch) | |
| tree | dbbba99516ff583b93f4ef0db5f69189976d6f22 | |
| parent | 415b205be3b424e06878b5d14ac8ccd5fb4087bf (diff) | |
pulsesink: Only use gst_audio_clock_new() when compiling against newer base
| -rw-r--r-- | ext/pulse/pulsemixerctrl.c | 6 | ||||
| -rw-r--r-- | ext/pulse/pulsesink.c | 6 | ||||
| -rw-r--r-- | ext/pulse/pulsesrc.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c index 760bd3ecb..be5b53679 100644 --- 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 5d676169d..32b32d4e0 100644 --- 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 1578d8693..9765b5c7d 100644 --- 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); } |