[vlc-commits] playlist: remove unnecessary vlc_object_alive() checks

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 26 21:10:43 2012 +0200| [9ee23d40389330a9e30304ec7d5d767168e4083f] | committer: Rémi Denis-Courmont

playlist: remove unnecessary vlc_object_alive() checks

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

 src/playlist/thread.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index f0ea2de..208b249 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -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 )
     {