diff --git a/gst-libs/gst/audio/gstaudioclock.c b/gst-libs/gst/audio/gstaudioclock.c index 44879e3004..2e9ffb1849 100644 --- a/gst-libs/gst/audio/gstaudioclock.c +++ b/gst-libs/gst/audio/gstaudioclock.c @@ -124,31 +124,6 @@ gst_audio_clock_dispose (GObject * object) * @name: the name of the clock * @func: a function * @user_data: user data - * - * Create a new #GstAudioClock instance. Whenever the clock time should be - * calculated it will call @func with @user_data. When @func returns - * #GST_CLOCK_TIME_NONE, the clock will return the last reported time. - * - * Returns: a new #GstAudioClock casted to a #GstClock. - */ -GstClock * -gst_audio_clock_new (const gchar * name, GstAudioClockGetTimeFunc func, - gpointer user_data) -{ - GstAudioClock *aclock = - GST_AUDIO_CLOCK (g_object_new (GST_TYPE_AUDIO_CLOCK, "name", name, NULL)); - - aclock->func = func; - aclock->user_data = user_data; - - return (GstClock *) aclock; -} - -/** - * gst_audio_clock_new_full: - * @name: the name of the clock - * @func: a function - * @user_data: user data * @destroy_notify: #GDestroyNotify for @user_data * * Create a new #GstAudioClock instance. Whenever the clock time should be @@ -160,7 +135,7 @@ gst_audio_clock_new (const gchar * name, GstAudioClockGetTimeFunc func, * Since: 0.10.31 */ GstClock * -gst_audio_clock_new_full (const gchar * name, GstAudioClockGetTimeFunc func, +gst_audio_clock_new (const gchar * name, GstAudioClockGetTimeFunc func, gpointer user_data, GDestroyNotify destroy_notify) { GstAudioClock *aclock = diff --git a/gst-libs/gst/audio/gstaudioclock.h b/gst-libs/gst/audio/gstaudioclock.h index cd96dc0ff6..5709187421 100644 --- a/gst-libs/gst/audio/gstaudioclock.h +++ b/gst-libs/gst/audio/gstaudioclock.h @@ -87,8 +87,6 @@ struct _GstAudioClockClass { GType gst_audio_clock_get_type (void); GstClock* gst_audio_clock_new (const gchar *name, GstAudioClockGetTimeFunc func, - gpointer user_data); -GstClock* gst_audio_clock_new_full (const gchar *name, GstAudioClockGetTimeFunc func, gpointer user_data, GDestroyNotify destroy_notify); void gst_audio_clock_reset (GstAudioClock *clock, GstClockTime time); diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index b73558e5d0..01fd93ae84 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -316,7 +316,8 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink) baseaudiosink->priv->discont_wait = DEFAULT_DISCONT_WAIT; baseaudiosink->provided_clock = gst_audio_clock_new ("GstAudioSinkClock", - (GstAudioClockGetTimeFunc) gst_base_audio_sink_get_time, baseaudiosink); + (GstAudioClockGetTimeFunc) gst_base_audio_sink_get_time, baseaudiosink, + NULL); basesink = GST_BASE_SINK_CAST (baseaudiosink); basesink->can_activate_push = TRUE; diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.c b/gst-libs/gst/audio/gstbaseaudiosrc.c index 23c89878e5..b3ceec69eb 100644 --- a/gst-libs/gst/audio/gstbaseaudiosrc.c +++ b/gst-libs/gst/audio/gstbaseaudiosrc.c @@ -247,7 +247,8 @@ gst_base_audio_src_init (GstBaseAudioSrc * baseaudiosrc) GST_BASE_SRC (baseaudiosrc)->blocksize = 0; baseaudiosrc->clock = gst_audio_clock_new ("GstAudioSrcClock", - (GstAudioClockGetTimeFunc) gst_base_audio_src_get_time, baseaudiosrc); + (GstAudioClockGetTimeFunc) gst_base_audio_src_get_time, baseaudiosrc, + NULL); /* we are always a live source */ gst_base_src_set_live (GST_BASE_SRC (baseaudiosrc), TRUE);