plugins/elements/gstqueue.c (_do_init, gst_queue_signals, gst_queue_base_init, gst_qu...

Original commit message from CVS:
* plugins/elements/gstqueue.c (_do_init, gst_queue_signals,
gst_queue_base_init, gst_queue_init):
use GST_BOILERPLATE

diff --git a/ChangeLog b/ChangeLog
index 26771726e15ae0fef4bad51d460f4774f66767ad..60a9734645c46eec4e8cd26ab73b42f5cb197b67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-10  Stefan Kost  <ensonic@users.sf.net>
+
+       * plugins/elements/gstqueue.c (_do_init, gst_queue_signals,
+         gst_queue_base_init, gst_queue_init):
+         use GST_BOILERPLATE
+
 2007-05-09  Sebastien Moutte  <sebastien@moutte.net>
 
        * win32/common/libgstreamer.def:

diff --git a/common b/common
index a6e41a42ec1b93fddbd14b2e5af87e2d456b8962..1b4fb5836a9e290fe13895643d41e0166de8a94c 160000 (submodule)
--- 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 85da6b2e38f036dc5e327db62482c22032dab7c0..ac65eb769521026118f05ea84a9bc38fc7f04c29 100644 (file)
--- 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");