Skip to content

V
vlc-2-2
Commit 9ee23d40 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

playlist: remove unnecessary vlc_object_alive() checks

parent a0ea1e5f
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
src/playlist/thread.c
View file @ 9ee23d40
...@@ -446,12 +446,13 @@ static void LoopInput( playlist_t *p_playlist ) ...@@ -446,12 +446,13 @@ static void LoopInput( playlist_t *p_playlist )
assert( p_input != NULL ); 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" ); PL_DEBUG( "incoming request - stopping current input" );
input_Stop( p_input, true ); input_Stop( p_input, true );
} }
#warning Unsynchronized access to *p_input flags...
/* This input is dead. Remove it ! */ /* This input is dead. Remove it ! */
if( p_input->b_dead ) if( p_input->b_dead )
{ {
...@@ -470,11 +471,6 @@ static void LoopInput( playlist_t *p_playlist ) ...@@ -470,11 +471,6 @@ static void LoopInput( playlist_t *p_playlist )
PL_LOCK; PL_LOCK;
return; 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 ! */ /* This input has finished, ask it to die ! */
else if( p_input->b_error || p_input->b_eof ) else if( p_input->b_error || p_input->b_eof )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment