From 27c43157156a24237285130f2d80fca41447c760 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 17 May 2005 03:18:32 +0000 Subject: [PATCH] gst/gstobject.*: s/GstObject */gpointer/ for the arguments of those 2 functions. Original commit message from CVS: * 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. --- ChangeLog | 7 +++++++ gst/gstobject.c | 8 ++++---- gst/gstobject.h | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4262b84ff..a6e3542ad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-17 Benjamin Otte + + * 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 * gst/Makefile.am: diff --git a/gst/gstobject.c b/gst/gstobject.c index 363e15f248..7b4bdbf84e 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -218,14 +218,14 @@ gst_object_constructor (GType type, guint n_construct_properties, * 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 @@ gst_object_ref (GstObject * object) * 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_object_unref (GstObject * object) 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); } /** diff --git a/gst/gstobject.h b/gst/gstobject.h index bbb9dc8181..da5c3dff49 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -139,8 +139,8 @@ void gst_object_restore_thyself (GstObject *object, xmlNodePtr self); #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 */