Changeset 56a0945078146cedcd3c9e33ce86caa24de79b2f

Timestamp:

03/19/08 00:05:06 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@free.fr>

git-committer:

Pierre d'Herbemont <pdherbemont@free.fr> 1205881506 +0100

git-parent:

[879e3eb226c7df84db6868b25964830664f92ebb]

git-author:

Pierre d'Herbemont <pdherbemont@free.fr> 1205879003 +0100

Message:

vlc_objects.h: Export and implement vlc_object_set_destructor().

Files:

• include/vlc_objects.h (modified) (3 diffs)
• src/libvlc.h (modified) (1 diff)
• src/misc/objects.c (modified) (4 diffs)

include/vlc_objects.h

@@ -84 +84 @@
-#define OBJECT_FLAGS_NOINTERACT  0x0004
-
+/* Types */
+typedef void (*vlc_destructor_t)(struct vlc_object_t *);
+
+/* Constants */
+VLC_PUBLIC_API const vlc_destructor_t kVLCDestructor;
+
-/*****************************************************************************
- * The vlc_object_t type. Yes, it's that simple :-)
@@ -97 +103 @@
- *****************************************************************************/
-VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
+VLC_EXPORT( void, __vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_t ) );
-VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
-VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
@@ -112 +119 @@
-    __vlc_object_create( VLC_OBJECT(a), b )
-
+#define vlc_object_set_destructor(a,b) \
+    __vlc_object_set_destructor( VLC_OBJECT(a), b )
+
-#define vlc_object_detach(a) \
-    __vlc_object_detach( VLC_OBJECT(a) )

src/libvlc.h

@@ -134 +134 @@
-
-    /* Objects management */
-
-
+
+
+
-};
-

src/misc/objects.c

@@ -74 +74 @@
-
-/*****************************************************************************
+ * Constants
+ *****************************************************************************/
+
+const vlc_destructor_t kVLCDestructor = NULL;
+
+/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
@@ -194 +200 @@
-
-    p_priv->i_refcount = 1;
+    p_priv->pf_destructor = kVLCDestructor;
-    p_new->p_parent = NULL;
-    p_new->pp_children = NULL;
@@ -355 +362 @@
-/**
- ****************************************************************************
+ * Set the destructor of a vlc object
+ *
+ * This function sets the destructor of the vlc object. It will be called
+ * when the object is destroyed when the its refcount reaches 0.
+ * (It is called by the internal function vlc_object_destroy())
+ *****************************************************************************/
+void __vlc_object_set_destructor( vlc_object_t *p_this,
+                                  vlc_destructor_t pf_destructor )
+{
+    vlc_object_internals_t *p_priv = vlc_internals(p_this );
+
+    vlc_mutex_lock( &structure_lock );
+    p_priv->pf_destructor = pf_destructor;
+    vlc_mutex_unlock( &structure_lock );
+}
+
+/**
+ ****************************************************************************
- * Destroy a vlc object (Internal)
- *
@@ -400 +425 @@
-        abort();
-    }
+
+    /* Call the custom "subclass" destructor */
+    if( p_priv->pf_destructor )
+        p_priv->pf_destructor( p_this );
+
-
-    /* Destroy the associated variables, starting from the end so that