]> git.sesse.net Git - vlc/commitdiff
playlist: remove unnecessary vlc_object_alive() checks
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 26 Nov 2012 19:10:43 +0000 (21:10 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 26 Nov 2012 19:12:38 +0000 (21:12 +0200)
src/playlist/thread.c

index f0ea2deadb2f4ff6b1a26af0eb3e182c7232d8fa..208b2495dddbd94bb2ab720e38858a3bd004e4f3 100644 (file)
@@ -446,12 +446,13 @@ static void LoopInput( playlist_t *p_playlist )
 
     assert( p_input != NULL );
 
-    if( ( p_sys->request.b_request || p_sys->killed ) && vlc_object_alive(p_input) )
+    if( p_sys->request.b_request || p_sys->killed )
     {
         PL_DEBUG( "incoming request - stopping current input" );
         input_Stop( p_input, true );
     }
 
+#warning Unsynchronized access to *p_input flags...
     /* This input is dead. Remove it ! */
     if( p_input->b_dead )
     {
@@ -470,11 +471,6 @@ static void LoopInput( playlist_t *p_playlist )
         PL_LOCK;
         return;
     }
-    /* This input is dying, let it do */
-    else if( !vlc_object_alive(p_input) )
-    {
-        PL_DEBUG( "dying input" );
-    }
     /* This input has finished, ask it to die ! */
     else if( p_input->b_error || p_input->b_eof )
     {