Do not use b_die directly, and simplify

2606ef55 · Rémi Denis-Courmont · a3069143 · 2606ef55
Commit 2606ef55 authored May 31, 2008 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

src/playlist/engine.c src/playlist/engine.c +6 -12

No files found.
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -487,13 +487,10 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj )
    while( vlc_object_alive( p_obj ) )
    {
-        while( p_obj->i_waiting == 0 )
+        if( p_obj->i_waiting == 0 )
        {
-            if( vlc_object_wait( p_obj ) || p_playlist->b_die )
+            vlc_object_wait( p_obj );
-            {
+            continue;
-                vlc_object_unlock( p_obj );
-                return;
-            }
        }
        p_current = p_obj->pp_waiting[0];
@@ -579,13 +576,10 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
    while( vlc_object_alive( p_obj ) )
    {
-        while( p_obj->i_waiting == 0 )
+        if( p_obj->i_waiting == 0 )
        {
-            if( vlc_object_wait( p_obj ) || p_playlist->b_die )
+            vlc_object_wait( p_obj );
-            {
+            continue;
-                vlc_mutex_unlock( &p_obj->object_lock );
-                return;
-            }
        }
        p_item = p_obj->pp_waiting[0];