Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gstminiobject.c

diff --git a/gst/gstminiobject.c b/gst/gstminiobject.c
index 9e6fd9b..78749dd 100644 (file)
--- a/gst/gstminiobject.c
+++ b/gst/gstminiobject.c
@@ -48,48 +48,6 @@ static GstAllocTrace *_gst_mini_object_trace;
 /* Mutex used for weak referencing */
 G_LOCK_DEFINE_STATIC (weak_refs_mutex);
 
-/* boxed copy and free functions. Don't real copy or free but simply
- * change the refcount */
-static GstMiniObject *
-_gst_mini_object_boxed_copy (GstMiniObject * mini_object)
-{
-  if (mini_object)
-    return gst_mini_object_ref (mini_object);
-  else
-    return NULL;
-}
-
-static void
-_gst_mini_object_boxed_free (GstMiniObject * mini_object)
-{
-  if (mini_object)
-    gst_mini_object_unref (mini_object);
-}
-
-/**
- * gst_mini_object_register:
- * @name: name of the new boxed type
- *
- * This function creates a new G_TYPE_BOXED derived type id for a new boxed type
- * with name @name. The default miniobject refcounting copy and free function
- * are used for the boxed type.
- *
- * Returns: a new G_TYPE_BOXED derived type id for @name.
- */
-GType
-gst_mini_object_register (const gchar * name)
-{
-  GType type;
-
-  g_return_val_if_fail (name != NULL, 0);
-
-  type = g_boxed_type_register_static (name,
-      (GBoxedCopyFunc) _gst_mini_object_boxed_copy,
-      (GBoxedFreeFunc) _gst_mini_object_boxed_free);
-
-  return type;
-}
-
 /**
  * gst_mini_object_init:
  * @mini_object: a #GstMiniObject 
@@ -254,17 +212,16 @@ gst_mini_object_unref (GstMiniObject * mini_object)
       GST_MINI_OBJECT_REFCOUNT_VALUE (mini_object) - 1);
 
   if (G_UNLIKELY (g_atomic_int_dec_and_test (&mini_object->refcount))) {
-    /* At this point, the refcount of the object is 0. We increase the refcount
-     * here because if a subclass recycles the object and gives out a new
-     * reference we don't want to free the instance anymore. */
-    gst_mini_object_ref (mini_object);
+    gboolean do_free;
 
     if (mini_object->dispose)
-      mini_object->dispose (mini_object);
+      do_free = mini_object->dispose (mini_object);
+    else
+      do_free = TRUE;
 
-    /* decrement the refcount again, if the subclass recycled the object we don't
+    /* if the subclass recycled the object (and returned FALSE) we don't
      * want to free the instance anymore */
-    if (G_LIKELY (g_atomic_int_dec_and_test (&mini_object->refcount))) {
+    if (G_LIKELY (do_free)) {
       /* The weak reference stack is freed in the notification function */
       if (mini_object->n_weak_refs)
         weak_refs_notify (mini_object);
@@ -358,6 +315,7 @@ gst_mini_object_steal (GstMiniObject ** olddata)
  * gst_mini_object_take:
  * @olddata: (inout) (transfer full): pointer to a pointer to a mini-object to
  *     be replaced
+ * @newdata: pointer to new mini-object
  *
  * Modifies a pointer to point to a new mini-object. The modification
  * is done atomically. This version is similar to gst_mini_object_replace()