mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioclock: remove _full version

Browse source
This commit is contained in:
Wim Taymans 2011-11-10 13:50:08 +01:00
parent f80d73468e
commit 1f8fe283f6
4 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst-libs/gst/audio/gstaudioclock.c
View file

@ -124,31 +124,6 @@ gst_audio_clock_dispose (GObject * object)
* @name: the name of the clock * @name: the name of the clock
* @func: a function * @func: a function
* @user_data: user data * @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 * @destroy_notify: #GDestroyNotify for @user_data
* *
* Create a new #GstAudioClock instance. Whenever the clock time should be * 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 * Since: 0.10.31
*/ */
GstClock * 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) gpointer user_data, GDestroyNotify destroy_notify)
{ {
GstAudioClock *aclock = GstAudioClock *aclock =

2
gst-libs/gst/audio/gstaudioclock.h
View file

@ -87,8 +87,6 @@ struct _GstAudioClockClass {
GType gst_audio_clock_get_type (void); GType gst_audio_clock_get_type (void);
GstClock* gst_audio_clock_new (const gchar *name, GstAudioClockGetTimeFunc func, 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); gpointer user_data, GDestroyNotify destroy_notify);
void gst_audio_clock_reset (GstAudioClock *clock, GstClockTime time); void gst_audio_clock_reset (GstAudioClock *clock, GstClockTime time);

3
gst-libs/gst/audio/gstbaseaudiosink.c
View file

@ -316,7 +316,8 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink)
baseaudiosink->priv->discont_wait = DEFAULT_DISCONT_WAIT; baseaudiosink->priv->discont_wait = DEFAULT_DISCONT_WAIT;
baseaudiosink->provided_clock = gst_audio_clock_new ("GstAudioSinkClock", 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 = GST_BASE_SINK_CAST (baseaudiosink);
basesink->can_activate_push = TRUE; basesink->can_activate_push = TRUE;

3
gst-libs/gst/audio/gstbaseaudiosrc.c
View file

@ -247,7 +247,8 @@ gst_base_audio_src_init (GstBaseAudioSrc * baseaudiosrc)
GST_BASE_SRC (baseaudiosrc)->blocksize = 0; GST_BASE_SRC (baseaudiosrc)->blocksize = 0;
baseaudiosrc->clock = gst_audio_clock_new ("GstAudioSrcClock", 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 */ /* we are always a live source */
gst_base_src_set_live (GST_BASE_SRC (baseaudiosrc), TRUE); gst_base_src_set_live (GST_BASE_SRC (baseaudiosrc), TRUE);