[vlc-devel] commit: Do not use b_die directly, and simplify ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat May 31 18:28:54 2008 +0300| [2606ef55873bcd2b1366c161b97d8d693facd26a]

Do not use b_die directly, and simplify

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2606ef55873bcd2b1366c161b97d8d693facd26a
---

 src/playlist/engine.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 89aa16c..45397c2 100644
--- 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_unlock( p_obj );
-                return;
-            }
+            vlc_object_wait( p_obj );
+            continue;
         }
 
         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_mutex_unlock( &p_obj->object_lock );
-                return;
-            }
+            vlc_object_wait( p_obj );
+            continue;
         }
 
         p_item = p_obj->pp_waiting[0];