From: <co...@fr...> - 2005-05-17 03:18:48
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: company Date: Mon May 16 2005 20:18:44 PDT Branch: BRANCH-COMPANY Log message: * gst/gstobject.c: (gst_object_ref), (gst_object_unref): * gst/gstobject.h: s/GstObject */gpointer/ for the arguments of those 2 functions. Mimicing GObject here. Modified files: . : ChangeLog gst : gstobject.c gstobject.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.966.2.71.2.8&r2=1.966.2.71.2.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstobject.c.diff?r1=1.80.2.1&r2=1.80.2.1.2.1 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstobject.h.diff?r1=1.47&r2=1.47.6.1 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.966.2.71.2.8 retrieving revision 1.966.2.71.2.9 diff -u -d -r1.966.2.71.2.8 -r1.966.2.71.2.9 --- ChangeLog 16 May 2005 17:01:34 -0000 1.966.2.71.2.8 +++ ChangeLog 17 May 2005 03:18:31 -0000 1.966.2.71.2.9 @@ -1,3 +1,10 @@ +2005-05-17 Benjamin Otte <in...@pu...> + + * gst/gstobject.c: (gst_object_ref), (gst_object_unref): + * gst/gstobject.h: + s/GstObject */gpointer/ for the arguments of those 2 functions. + Mimicing GObject here. 2005-05-16 Benjamin Otte <in...@pu...> * gst/Makefile.am: Index: gstobject.c RCS file: /cvs/gstreamer/gstreamer/gst/gstobject.c,v retrieving revision 1.80.2.1 retrieving revision 1.80.2.1.2.1 diff -u -d -r1.80.2.1 -r1.80.2.1.2.1 --- gstobject.c 26 Apr 2005 02:01:52 -0000 1.80.2.1 +++ gstobject.c 17 May 2005 03:18:32 -0000 1.80.2.1.2.1 @@ -218,14 +218,14 @@ * Returns: A pointer to the object */ GstObject * -gst_object_ref (GstObject * object) +gst_object_ref (gpointer object) { g_return_val_if_fail (GST_IS_OBJECT (object), NULL); GST_CAT_LOG_OBJECT (GST_CAT_REFCOUNTING, object, "ref %d->%d", G_OBJECT (object)->ref_count, G_OBJECT (object)->ref_count + 1); - g_object_ref (G_OBJECT (object)); + g_object_ref (object); return object; } @@ -237,7 +237,7 @@ * zero, destroy the object. void -gst_object_unref (GstObject * object) +gst_object_unref (gpointer object) g_return_if_fail (GST_IS_OBJECT (object)); g_return_if_fail (G_OBJECT (object)->ref_count > 0); @@ -245,7 +245,7 @@ GST_CAT_LOG_OBJECT (GST_CAT_REFCOUNTING, object, "unref %d->%d", G_OBJECT (object)->ref_count, G_OBJECT (object)->ref_count - 1); - g_object_unref (G_OBJECT (object)); + g_object_unref (object); /** Index: gstobject.h RCS file: /cvs/gstreamer/gstreamer/gst/gstobject.h,v retrieving revision 1.47 retrieving revision 1.47.6.1 diff -u -d -r1.47 -r1.47.6.1 --- gstobject.h 3 Jul 2004 04:59:12 -0000 1.47 +++ gstobject.h 17 May 2005 03:18:32 -0000 1.47.6.1 @@ -139,8 +139,8 @@ #endif /* refcounting + life cycle */ -GstObject * gst_object_ref (GstObject *object); -void gst_object_unref (GstObject *object); +GstObject * gst_object_ref (gpointer object); +void gst_object_unref (gpointer object); void gst_object_sink (GstObject *object); /* replace object pointer */ |