Changeset d2ff9ebf3b5c789711a83777986b1d07261afd67

Timestamp:

07/05/08 14:04:29 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1215259469 +0300

git-parent:

[8f231e304b9dece94d897687f17c4d62f92b0ee8]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1215259450 +0300

Message:

interaction: safely join the thread

Files:

• src/interface/interaction.c (modified) (1 diff)
• src/interface/interface.h (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)

src/interface/interaction.c

@@ -387 +387 @@
-
-    return p_interaction;
+}
+
+void interaction_Destroy( interaction_t *p_interaction )
+{
+    if( !p_interaction )
+        return;
+
+    vlc_object_kill( p_interaction );
+    vlc_thread_join( p_interaction );
+    vlc_object_release( p_interaction );
-}
-

src/interface/interface.h

@@ -35 +35 @@
- **********************************************************************/
-
-/* release via vlc_object_release() */
-interaction_t * interaction_Init( libvlc_int_t *p_libvlc );
+void interaction_Destroy( interaction_t * );
-
-#endif

src/libvlc.c

@@ -965 +965 @@
-    /* Free interaction */
-    msg_Dbg( p_libvlc, "removing interaction" );
-vlc_object_release
+interaction_Destroy
-
-    /* Free video outputs */