Changeset 59db278a9360524243ff213b171c4cfcf2c77046

Timestamp:

05/12/05 18:35:18 (3 years ago)

Author:

Steve Lhomme <robux@videolan.org>

git-committer:

Steve Lhomme <robux@videolan.org> 1115915718 +0000

git-parent:

[d31b60cea8dc9a9f5bb453edbda03c6d5cd8b05a]

git-author:

Steve Lhomme <robux@videolan.org> 1115915718 +0000

Message:

mkv.cpp: thread handling cleaning

Files:

• modules/demux/mkv.cpp (modified) (5 diffs)

modules/demux/mkv.cpp

@@ -2258 +2258 @@
-        p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) );
-        p_ev->p_demux = &demuxer;
+        p_ev->b_die = VLC_FALSE;
-        vlc_mutex_init( p_ev, &p_ev->lock );
-        vlc_thread_create( p_ev, "mkv event thread handler", EventThread,
@@ -2269 +2270 @@
-    {
-        p_ev->b_die = VLC_TRUE;
+
+        vlc_thread_join( p_ev );
+        vlc_object_destroy( p_ev );
+
+        p_ev = NULL;
-
-        var_Destroy( p_input, "highlight-mutex" );
@@ -2278 +2284 @@
-        var_Destroy( p_input, "color" );
-        var_Destroy( p_input, "menu-contrast" );
-
-        vlc_thread_join( p_ev );
-        vlc_object_destroy( p_ev );
-
-        p_ev = NULL;
-
-        msg_Dbg( &demuxer, "Stopping the UI Hook" );
@@ -2485 +2486 @@
-        }
-
-
+else 
-        {
-            p_vout = (vlc_object_t*) vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT,
@@ -2496 +2497 @@
-        }
-
-
+, 10ms
-        msleep( 10000 );
-    }