From 2a132759855b5f27388ea005d4be3511eefae0a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 28 Oct 2011 09:38:35 +0200 Subject: [PATCH] collectpads2: Use G_DEFINE_TYPE instead of GST_BOILERPLATE --- libs/gst/base/gstcollectpads2.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c index 428638e..18f6791 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads2.c @@ -77,7 +77,7 @@ * * * - * Last reviewed on 2008-03-14 (0.10.17) + * Last reviewed on 2011-10-28 (0.10.36) * * Since: 0.10.36 */ @@ -87,8 +87,8 @@ GST_DEBUG_CATEGORY_STATIC (collect_pads2_debug); #define GST_CAT_DEFAULT collect_pads2_debug -GST_BOILERPLATE (GstCollectPads2, gst_collect_pads2, GstObject, - GST_TYPE_OBJECT); +#define parent_class gst_collect_pads2_parent_class +G_DEFINE_TYPE (GstCollectPads2, gst_collect_pads2, GST_TYPE_OBJECT); static void gst_collect_pads2_clear (GstCollectPads2 * pads, GstCollectData2 * data); @@ -149,12 +149,6 @@ static void unref_data (GstCollectData2 * data); } G_STMT_END static void -gst_collect_pads2_base_init (gpointer g_class) -{ - /* Do nothing here */ -} - -static void gst_collect_pads2_class_init (GstCollectPads2Class * klass) { GObjectClass *gobject_class = (GObjectClass *) klass; @@ -166,7 +160,7 @@ gst_collect_pads2_class_init (GstCollectPads2Class * klass) } static void -gst_collect_pads2_init (GstCollectPads2 * pads, GstCollectPads2Class * g_class) +gst_collect_pads2_init (GstCollectPads2 * pads) { pads->data = NULL; pads->cookie = 0; -- 2.7.4