wtay gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/ogg/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     wtay
Date:           Wed Dec 10 2008  14:55:24 UTC

Log message:
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_class_init),
(gst_ogg_pad_dispose), (gst_ogg_pad_finalize):
Use G_DEFINE_TYPE for the OggPad to get some threadsafe type
init from glib.

Modified files:
    .               : ChangeLog
    ext/ogg         : gstoggdemux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4238&r2=1.4239
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c.diff?r1=1.198&r2=1.199

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4238
retrieving revision 1.4239
diff -u -d -r1.4238 -r1.4239
--- ChangeLog	10 Dec 2008 08:19:11 -0000	1.4238
+++ ChangeLog	10 Dec 2008 14:55:08 -0000	1.4239
@@ -1,3 +1,10 @@
+2008-12-10  Wim Taymans  <[email protected]>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_class_init),
+	(gst_ogg_pad_dispose), (gst_ogg_pad_finalize):
+	Use G_DEFINE_TYPE for the OggPad to get some threadsafe type 
+	init from glib.
 2008-12-10  Sebastian Dröge  <[email protected]>
 
 	Patch by: Luis Menina <liberforce at freeside dot fr>
Index: gstoggdemux.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- gstoggdemux.c	25 Nov 2008 15:28:36 -0000	1.198
+++ gstoggdemux.c	10 Dec 2008 14:55:10 -0000	1.199
@@ -128,31 +128,7 @@
 static GstFlowReturn gst_ogg_demux_combine_flows (GstOggDemux * ogg,
     GstOggPad * pad, GstFlowReturn ret);
-static GstPadClass *ogg_pad_parent_class = NULL;
-
-static GType
-gst_ogg_pad_get_type (void)
-{
-  static GType ogg_pad_type = 0;
-  if (!ogg_pad_type) {
-    static const GTypeInfo ogg_pad_info = {
-      sizeof (GstOggPadClass),
-      NULL,
-      (GClassInitFunc) gst_ogg_pad_class_init,
-      sizeof (GstOggPad),
-      0,
-      (GInstanceInitFunc) gst_ogg_pad_init,
-    };
-    ogg_pad_type =
-        g_type_register_static (GST_TYPE_PAD, "GstOggPad", &ogg_pad_info, 0);
-  }
-  return ogg_pad_type;
-}
+G_DEFINE_TYPE (GstOggPad, gst_ogg_pad, GST_TYPE_PAD);
 static void
 gst_ogg_pad_class_init (GstOggPadClass * klass)
@@ -161,8 +137,6 @@
   gobject_class = (GObjectClass *) klass;
-  ogg_pad_parent_class = g_type_class_peek_parent (klass);
   gobject_class->dispose = gst_ogg_pad_dispose;
   gobject_class->finalize = gst_ogg_pad_finalize;
 }
@@ -224,7 +198,7 @@
   ogg_stream_reset (&pad->stream);
-  G_OBJECT_CLASS (ogg_pad_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gst_ogg_pad_parent_class)->dispose (object);
@@ -234,7 +208,7 @@
   ogg_stream_clear (&pad->stream);
-  G_OBJECT_CLASS (ogg_pad_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gst_ogg_pad_parent_class)->finalize (object);
 #if 0

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose