+ /* "Automatic" item change ( next ) */
+ else
+ {
+ bool b_loop = var_GetBool( p_playlist, "loop" );
+ bool b_repeat = var_GetBool( p_playlist, "repeat" );
+ bool b_playstop = var_GetBool( p_playlist, "play-and-stop" );
+
+ /* Repeat and play/stop */
+ if( b_repeat && get_current_status_item( p_playlist ) )
+ {
+ msg_Dbg( p_playlist,"repeating item" );
+ return get_current_status_item( p_playlist );
+ }
+ if( b_playstop )
+ {
+ msg_Dbg( p_playlist,"stopping (play and stop)" );
+ return NULL;
+ }
+
+ /* */
+ if( get_current_status_item( p_playlist ) )
+ {
+ playlist_item_t *p_parent = get_current_status_item( p_playlist );
+ while( p_parent )
+ {
+ if( p_parent->i_flags & PLAYLIST_SKIP_FLAG )
+ {
+ msg_Dbg( p_playlist, "blocking item, stopping") ;
+ return NULL;
+ }
+ p_parent = p_parent->p_parent;
+ }
+ }
+
+ PL_DEBUG( "changing item without a request (current %i/%i)",
+ p_playlist->i_current_index, p_playlist->current.i_size );
+ /* Cant go to next from current item */
+ if( get_current_status_item( p_playlist ) &&
+ get_current_status_item( p_playlist )->i_flags & PLAYLIST_SKIP_FLAG )
+ return NULL;
+
+ if( p_sys->b_reset_currently_playing )
+ ResetCurrentlyPlaying( p_playlist,
+ get_current_status_item( p_playlist ) );
+
+ p_playlist->i_current_index++;
+ assert( p_playlist->i_current_index <= p_playlist->current.i_size );
+ if( p_playlist->i_current_index == p_playlist->current.i_size )
+ {
+ if( !b_loop || p_playlist->current.i_size == 0 )
+ return NULL;
+ p_playlist->i_current_index = 0;
+ }
+ PL_DEBUG( "using item %i", p_playlist->i_current_index );
+ if ( p_playlist->current.i_size == 0 )
+ return NULL;
+
+ p_new = ARRAY_VAL( p_playlist->current, p_playlist->i_current_index );
+ /* The new item can't be autoselected */
+ if( p_new != NULL && p_new->i_flags & PLAYLIST_SKIP_FLAG )
+ return NULL;
+ }
+ return p_new;
+}
+
+static int LoopInput( playlist_t *p_playlist )
+{
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+ input_thread_t *p_input = p_sys->p_input;
+
+ if( !p_input )
+ return VLC_EGENERIC;
+
+ if( ( p_sys->request.b_request || !vlc_object_alive( p_playlist ) ) && !p_input->b_die )
+ {
+ PL_DEBUG( "incoming request - stopping current input" );
+ input_Stop( p_input, true );
+ }
+
+ /* This input is dead. Remove it ! */
+ if( p_input->b_dead )
+ {
+ PL_DEBUG( "dead input" );
+
+ PL_UNLOCK;
+ /* We can unlock as we return VLC_EGENERIC (no event will be lost) */
+
+ /* input_resource_t must be manipulated without playlist lock */
+ if( !var_CreateGetBool( p_input, "sout-keep" ) )
+ input_resource_TerminateSout( p_sys->p_input_resource );
+
+ /* The DelCallback must be issued without playlist lock */
+ var_DelCallback( p_input, "intf-event", InputEvent, p_playlist );
+
+ PL_LOCK;
+
+ p_sys->p_input = NULL;
+ vlc_thread_join( p_input );
+ vlc_object_release( p_input );
+
+ UpdateActivity( p_playlist, -DEFAULT_INPUT_ACTIVITY );
+
+ return VLC_EGENERIC;
+ }
+ /* This input is dying, let it do */
+ else if( p_input->b_die )
+ {
+ PL_DEBUG( "dying input" );
+ }
+ /* This input has finished, ask it to die ! */
+ else if( p_input->b_error || p_input->b_eof )
+ {
+ PL_DEBUG( "finished input" );
+ input_Stop( p_input, false );
+ }
+ return VLC_SUCCESS;
+}
+
+static void LoopRequest( playlist_t *p_playlist )
+{
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+ assert( !p_sys->p_input );
+
+ /* No input. Several cases
+ * - No request, running status -> start new item
+ * - No request, stopped status -> collect garbage
+ * - Request, running requested -> start new item
+ * - Request, stopped requested -> collect garbage
+ */
+ const int i_status = p_sys->request.b_request ?
+ p_sys->request.i_status : p_sys->status.i_status;
+
+ if( i_status == PLAYLIST_STOPPED || !vlc_object_alive( p_playlist ) )
+ {
+ p_sys->status.i_status = PLAYLIST_STOPPED;
+
+ if( p_sys->p_input_resource &&
+ input_resource_HasVout( p_sys->p_input_resource ) )
+ {
+ /* XXX We can unlock if we don't issue the wait as we will be
+ * call again without anything else done between the calls */
+ PL_UNLOCK;
+
+ /* input_resource_t must be manipulated without playlist lock */
+ input_resource_TerminateVout( p_sys->p_input_resource );
+
+ PL_LOCK;
+ }
+ else
+ {
+ if( vlc_object_alive( p_playlist ) )
+ vlc_cond_wait( &p_sys->signal, &p_sys->lock );
+ }
+ return;
+ }
+
+ playlist_item_t *p_item = NextItem( p_playlist );
+ if( p_item )
+ {
+ msg_Dbg( p_playlist, "starting new item" );
+ PlayItem( p_playlist, p_item );
+ return;
+ }
+
+ msg_Dbg( p_playlist, "nothing to play" );
+ p_sys->status.i_status = PLAYLIST_STOPPED;
+
+ if( var_GetBool( p_playlist, "play-and-exit" ) )
+ {
+ msg_Info( p_playlist, "end of playlist, exiting" );
+ libvlc_Quit( p_playlist->p_libvlc );
+ }
+}
+
+/**
+ * Run the main control thread itself
+ */
+static void *Thread ( void *data )
+{
+ playlist_t *p_playlist = data;
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+
+ playlist_Lock( p_playlist );
+ while( vlc_object_alive( p_playlist ) || p_sys->p_input )
+ {
+ /* FIXME: what's that ! */
+ if( p_sys->b_reset_currently_playing &&
+ mdate() - p_sys->last_rebuild_date > 30000 ) // 30 ms
+ {
+ ResetCurrentlyPlaying( p_playlist,
+ get_current_status_item( p_playlist ) );
+ p_sys->last_rebuild_date = mdate();
+ }
+
+ /* If there is an input, check that it doesn't need to die. */
+ while( !LoopInput( p_playlist ) )
+ vlc_cond_wait( &p_sys->signal, &p_sys->lock );
+
+ LoopRequest( p_playlist );
+ }
+ playlist_Unlock( p_playlist );