From 41f1ec1c811fbce588b9b226f9bf8ce10cc395ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 13 Dec 2014 16:01:44 +0100 Subject: [PATCH] audioclock: Use G_DEFINE_TYPE instead of a custom get_type() function --- gst-libs/gst/audio/gstaudioclock.c | 31 ++---------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/gst-libs/gst/audio/gstaudioclock.c b/gst-libs/gst/audio/gstaudioclock.c index 70f507434d..47cc01aa9e 100644 --- a/gst-libs/gst/audio/gstaudioclock.c +++ b/gst-libs/gst/audio/gstaudioclock.c @@ -47,35 +47,8 @@ static void gst_audio_clock_dispose (GObject * object); static GstClockTime gst_audio_clock_get_internal_time (GstClock * clock); -static GstSystemClockClass *parent_class = NULL; - -/* static guint gst_audio_clock_signals[LAST_SIGNAL] = { 0 }; */ - -GType -gst_audio_clock_get_type (void) -{ - static volatile gsize clock_type = 0; - static const GTypeInfo clock_info = { - sizeof (GstAudioClockClass), - NULL, - NULL, - (GClassInitFunc) gst_audio_clock_class_init, - NULL, - NULL, - sizeof (GstAudioClock), - 4, - (GInstanceInitFunc) gst_audio_clock_init, - NULL - }; - - if (g_once_init_enter (&clock_type)) { - GType tmp = g_type_register_static (GST_TYPE_SYSTEM_CLOCK, "GstAudioClock", - &clock_info, 0); - g_once_init_leave (&clock_type, tmp); - } - - return (GType) clock_type; -} +#define parent_class gst_audio_clock_parent_class +G_DEFINE_TYPE (GstAudioClock, gst_audio_clock, GST_TYPE_SYSTEM_CLOCK); static void gst_audio_clock_class_init (GstAudioClockClass * klass)