Changeset 05dc64af7e19036bbf6fa538345b5a2278a1d91f

Timestamp:

03/23/08 01:15:54 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206231354 +0100

git-parent:

[dbdd540a2e2aefb8f572d199ddd1b850f9d97f11]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1206231354 +0100

Message:

objects: Call vlc_object_join() automatically from vlc_object_destructor() if needed.
interaction: No need to call vlc_object_join() now.

Files:

• src/interface/interaction.c (modified) (2 diffs)
• src/misc/objects.c (modified) (2 diffs)

src/interface/interaction.c

@@ -48 +48 @@
-static void                     InteractionLoop( vlc_object_t * );
-static void                     InteractionManage( interaction_t * );
-static void interaction_Destructor( vlc_object_t *p_interaction );
-
-static interaction_dialog_t    *DialogGetById( interaction_t* , int );
@@ -384 +383 @@
-    }
-    
-    vlc_object_set_destructor( p_interaction, interaction_Destructor );
-
-    return VLC_OBJECT( p_interaction );
-}
-
-static void interaction_Destructor( vlc_object_t *p_interaction )
-{
-    vlc_thread_join( p_interaction );
-}
-

src/misc/objects.c

@@ -201 +201 @@
-    p_priv->i_refcount = 1;
-    p_priv->pf_destructor = kVLCDestructor;
+    p_priv->b_thread = VLC_FALSE;
-    p_new->p_parent = NULL;
-    p_new->pp_children = NULL;
@@ -419 +420 @@
-    /* Send a kill to the object's thread if applicable */
-    vlc_object_kill( p_this );
+
+    /* If we are running on a thread, wait until it ends */
+    if( p_priv->b_thread )
+        vlc_thread_join( p_this );
-
-    /* Call the custom "subclass" destructor */