[gst-cvs] wingo gstreamer: gstreamer/ gstreamer/gst/base/

[<wi...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wingo
Date:           Sat Nov 05 2005  07:14:45 PST

Log message:
2005-11-05  Andy Wingo  <wi...@po...>
	* gst/base/gstpushsrc.c: Shorten by 30% via use of boilerplate
	macro.

Modified files:
    .               : ChangeLog
    gst/base        : gstpushsrc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1836&r2=1.1837
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/base/gstpushsrc.c.diff?r1=1.6&r2=1.7

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.1836
retrieving revision 1.1837
diff -u -d -r1.1836 -r1.1837
--- ChangeLog	4 Nov 2005 20:11:59 -0000	1.1836
+++ ChangeLog	5 Nov 2005 15:14:33 -0000	1.1837
@@ -1,3 +1,8 @@
+2005-11-05  Andy Wingo  <wi...@po...>
+
+	* gst/base/gstpushsrc.c: Shorten by 30% via use of boilerplate
+	macro.
 2005-11-04  Stefan Kost  <en...@us...>
 
 	* docs/gst/gstreamer-sections.txt:
Index: gstpushsrc.c
RCS file: /cvs/gstreamer/gstreamer/gst/base/gstpushsrc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gstpushsrc.c	13 Oct 2005 15:27:40 -0000	1.6
+++ gstpushsrc.c	5 Nov 2005 15:14:33 -0000	1.7
@@ -55,51 +55,12 @@
 GST_DEBUG_CATEGORY_STATIC (gst_push_src_debug);
 #define GST_CAT_DEFAULT gst_push_src_debug
-/* PushSrc signals and args */
-enum
-{
-  /* FILL ME */
-  LAST_SIGNAL
-};
-
-  PROP_0,
-static GstElementClass *parent_class = NULL;
-static void gst_push_src_base_init (gpointer g_class);
-static void gst_push_src_class_init (GstPushSrcClass * klass);
-static void gst_push_src_init (GstPushSrc * src, gpointer g_class);
-GType
-gst_push_src_get_type (void)
-  static GType push_src_type = 0;
-  if (!push_src_type) {
-    static const GTypeInfo push_src_info = {
-      sizeof (GstPushSrcClass),
-      (GBaseInitFunc) gst_push_src_base_init,
-      NULL,
-      (GClassInitFunc) gst_push_src_class_init,
-      sizeof (GstPushSrc),
-      0,
-      (GInstanceInitFunc) gst_push_src_init,
-    };
-    push_src_type = g_type_register_static (GST_TYPE_BASE_SRC,
-        "GstPushSrc", &push_src_info, G_TYPE_FLAG_ABSTRACT);
-  }
-  return push_src_type;
-}
+#define _do_init(type) \
+    GST_DEBUG_CATEGORY_INIT (gst_push_src_debug, "pushsrc", 0, \
+        "pushsrc element");
-#if 0
-static const GstEventMask *gst_push_src_get_event_mask (GstPad * pad);
-#endif
+GST_BOILERPLATE_FULL (GstPushSrc, gst_push_src, GstBaseSrc, GST_TYPE_BASE_SRC,
+    _do_init);
 static GstFlowReturn gst_push_src_create (GstBaseSrc * bsrc, guint64 offset,
     guint length, GstBuffer ** ret);
@@ -107,28 +68,21 @@
 static void
 gst_push_src_base_init (gpointer g_class)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_push_src_debug, "pushsrc", 0, "pushsrc element");
+  /* nop */
 }
 gst_push_src_class_init (GstPushSrcClass * klass)
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-  GstBaseSrcClass *gstbasesrc_class;
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-  gstbasesrc_class = (GstBaseSrcClass *) klass;
-  parent_class = g_type_class_ref (GST_TYPE_BASE_SRC);
+  GstBaseSrcClass *gstbasesrc_class = (GstBaseSrcClass *) klass;
   gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_push_src_create);
-gst_push_src_init (GstPushSrc * pushsrc, gpointer g_class)
+gst_push_src_init (GstPushSrc * pushsrc, GstPushSrcClass * klass)
 static GstFlowReturn