From 687b7ad0092217181b83e816e276d28571c67bcd Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 10 May 2007 12:40:12 +0000 Subject: [PATCH] plugins/elements/gstqueue.c (_do_init, gst_queue_signals, gst_queue_base_init, gst_queue_init): use GST_BOILERPLATE Original commit message from CVS: * plugins/elements/gstqueue.c (_do_init, gst_queue_signals, gst_queue_base_init, gst_queue_init): use GST_BOILERPLATE --- ChangeLog | 6 ++++++ common | 2 +- plugins/elements/gstqueue.c | 48 ++++++++++----------------------------------- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2677172..60a9734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-10 Stefan Kost + + * plugins/elements/gstqueue.c (_do_init, gst_queue_signals, + gst_queue_base_init, gst_queue_init): + use GST_BOILERPLATE + 2007-05-09 Sebastien Moutte * win32/common/libgstreamer.def: diff --git a/common b/common index a6e41a4..1b4fb58 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a6e41a42ec1b93fddbd14b2e5af87e2d456b8962 +Subproject commit 1b4fb5836a9e290fe13895643d41e0166de8a94c diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 85da6b2..ac65eb7 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -155,10 +155,14 @@ enum g_mutex_unlock (q->qlock); \ } G_STMT_END +#define _do_init(bla) \ + GST_DEBUG_CATEGORY_INIT (queue_debug, "queue", 0, "queue element"); \ + GST_DEBUG_CATEGORY_INIT (queue_dataflow, "queue_dataflow", 0, \ + "dataflow inside the queue element"); + +GST_BOILERPLATE_FULL (GstQueue, gst_queue, GstElement, + GST_TYPE_ELEMENT, _do_init); -static void gst_queue_base_init (GstQueueClass * klass); -static void gst_queue_class_init (GstQueueClass * klass); -static void gst_queue_init (GstQueue * queue); static void gst_queue_finalize (GObject * object); static void gst_queue_set_property (GObject * object, @@ -211,42 +215,12 @@ queue_leaky_get_type (void) return queue_leaky_type; } -static GstElementClass *parent_class = NULL; static guint gst_queue_signals[LAST_SIGNAL] = { 0 }; -GType -gst_queue_get_type (void) -{ - static GType queue_type = 0; - - if (!queue_type) { - static const GTypeInfo queue_info = { - sizeof (GstQueueClass), - (GBaseInitFunc) gst_queue_base_init, - NULL, - (GClassInitFunc) gst_queue_class_init, - NULL, - NULL, - sizeof (GstQueue), - 0, - (GInstanceInitFunc) gst_queue_init, - NULL - }; - - queue_type = g_type_register_static (GST_TYPE_ELEMENT, - "GstQueue", &queue_info, 0); - GST_DEBUG_CATEGORY_INIT (queue_debug, "queue", 0, "queue element"); - GST_DEBUG_CATEGORY_INIT (queue_dataflow, "queue_dataflow", 0, - "dataflow inside the queue element"); - } - - return queue_type; -} - static void -gst_queue_base_init (GstQueueClass * klass) +gst_queue_base_init (gpointer g_class) { - GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); + GstElementClass *gstelement_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&srctemplate)); @@ -261,8 +235,6 @@ gst_queue_class_init (GstQueueClass * klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_queue_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_queue_get_property); @@ -358,7 +330,7 @@ gst_queue_class_init (GstQueueClass * klass) } static void -gst_queue_init (GstQueue * queue) +gst_queue_init (GstQueue * queue, GstQueueClass * g_class) { queue->sinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink"); -- 2.7.4