diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-22 18:53:15 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-06-22 18:53:15 +0100 |
commit | ddb11b4f2de471a7f02c707c49503cc9e3a8aed8 (patch) | |
tree | 378a34c12ca1cf937d91ec7f11abe4aac18dc558 | |
parent | 23faba019036f1d44e5ed0f98a052e98b1f36a12 (diff) |
gstobject: deprecate gst_object_{set|get}_name_prefix()
The name prefix stuff has never been used for anything and it doesn't
look like we'll ever want to use it for anything.
Fixes #621006.
-rw-r--r-- | gst/gstobject.c | 16 | ||||
-rw-r--r-- | gst/gstobject.h | 9 |
2 files changed, 22 insertions, 3 deletions
diff --git a/gst/gstobject.c b/gst/gstobject.c index f14d09ceb2..4ed747bfd1 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -726,7 +726,14 @@ gst_object_get_name (GstObject * object) * retains ownership of the name prefix it sent. * * MT safe. This function grabs and releases @object's LOCK. + * + * Deprecated: deprecated because the name prefix has never actually been used + * for anything. */ +#ifndef GST_REMOVE_DEPRECATED +#ifdef GST_DISABLE_DEPRECATED +void gst_object_set_name_prefix (GstObject * object, const gchar * name_prefix); +#endif void gst_object_set_name_prefix (GstObject * object, const gchar * name_prefix) { @@ -737,6 +744,7 @@ gst_object_set_name_prefix (GstObject * object, const gchar * name_prefix) object->name_prefix = g_strdup (name_prefix); /* NULL gives NULL */ GST_OBJECT_UNLOCK (object); } +#endif /* GST_REMOVE_DEPRECATED */ /** * gst_object_get_name_prefix: @@ -750,7 +758,14 @@ gst_object_set_name_prefix (GstObject * object, const gchar * name_prefix) * Returns: the name prefix of @object. g_free() after usage. * * MT safe. This function grabs and releases @object's LOCK. + * + * Deprecated: deprecated because the name prefix has never actually been used + * for anything. */ +#ifndef GST_REMOVE_DEPRECATED +#ifdef GST_DISABLE_DEPRECATED +gchar *gst_object_get_name_prefix (GstObject * object); +#endif gchar * gst_object_get_name_prefix (GstObject * object) { @@ -764,6 +779,7 @@ gst_object_get_name_prefix (GstObject * object) return result; } +#endif /* GST_REMOVE_DEPRECATED */ /** * gst_object_set_parent: diff --git a/gst/gstobject.h b/gst/gstobject.h index 0df0b727c5..6b04e49a84 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -186,7 +186,7 @@ typedef struct _GstObjectClass GstObjectClass; * @refcount: unused * @lock: object LOCK * @name: The name of the object - * @name_prefix: used for debugging + * @name_prefix: unused * @parent: this object's parent, weak ref * @flags: use GST_OBJECT_IS_XXX macros to access the flags * @@ -196,12 +196,12 @@ struct _GstObject { GObject object; /*< public >*/ - gint refcount; + gint refcount; /* unused (FIXME 0.11: remove) */ /*< public >*/ /* with LOCK */ GMutex *lock; /* object LOCK */ gchar *name; /* object name */ - gchar *name_prefix; /* used for debugging */ + gchar *name_prefix; /* (un)used for debugging (FIXME 0.11: remove) */ GstObject *parent; /* this object's parent, weak ref */ guint32 flags; @@ -285,8 +285,11 @@ GType gst_object_get_type (void); /* name routines */ gboolean gst_object_set_name (GstObject *object, const gchar *name); gchar* gst_object_get_name (GstObject *object); + +#ifndef GST_DISABLE_DEPRECATED void gst_object_set_name_prefix (GstObject *object, const gchar *name_prefix); gchar* gst_object_get_name_prefix (GstObject *object); +#endif /* parentage routines */ gboolean gst_object_set_parent (GstObject *object, GstObject *parent); |