Skip to content

V
vlc
Commit 239fcbc3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

playlist: use input "state" variable instead of b_dead

parent af922d5e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
src/playlist/thread.c
View file @ 239fcbc3
...@@ -442,10 +442,11 @@ static void LoopInput( playlist_t *p_playlist ) ...@@ -442,10 +442,11 @@ static void LoopInput( playlist_t *p_playlist )
input_Stop( p_input ); input_Stop( p_input );
} }
#warning Unsynchronized access to *p_input flags... switch( var_GetInteger( p_input, "state" ) )
/* This input is dead. Remove it ! */
if( p_input->b_dead )
{ {
case END_S:
case ERROR_S:
/* This input is dead. Remove it ! */
p_sys->p_input = NULL; p_sys->p_input = NULL;
PL_DEBUG( "dead input" ); PL_DEBUG( "dead input" );
PL_UNLOCK; PL_UNLOCK;
...@@ -460,10 +461,10 @@ static void LoopInput( playlist_t *p_playlist ) ...@@ -460,10 +461,10 @@ static void LoopInput( playlist_t *p_playlist )
input_Close( p_input ); input_Close( p_input );
PL_LOCK; PL_LOCK;
return; break;
default:
vlc_cond_wait( &p_sys->signal, &p_sys->lock );
} }
vlc_cond_wait( &p_sys->signal, &p_sys->lock );
} }
static bool Next( playlist_t *p_playlist ) static bool Next( playlist_t *p_playlist )
......
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