# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
+#include <vlc_rand.h>
+#include "stream_output/stream_output.h"
#include "playlist_internal.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void* RunControlThread ( vlc_object_t * );
-static void* RunPreparse ( vlc_object_t * );
-static void* RunFetcher ( vlc_object_t * );
-static void PreparseDestructor ( vlc_object_t * );
-static void FetcherDestructor ( vlc_object_t * );
+static void *Thread ( void * );
/*****************************************************************************
* Main functions for the global thread
*****************************************************************************/
/**
- * Create the main playlist thread
+ * Create the main playlist threads.
* Additionally to the playlist, this thread controls :
* - Statistics
* - VLM
* \param p_parent
* \return an object with a started thread
*/
-void __playlist_ThreadCreate( vlc_object_t *p_parent )
+void playlist_Activate( playlist_t *p_playlist )
{
- playlist_t *p_playlist = playlist_Create( p_parent );
- if( !p_playlist ) return;
-
- // Preparse
- static const char ppname[] = "preparser";
- p_playlist->p_preparse =
- vlc_custom_create( p_playlist, sizeof( playlist_preparse_t ),
- VLC_OBJECT_GENERIC, ppname );
- if( !p_playlist->p_preparse )
- {
- msg_Err( p_playlist, "unable to create preparser" );
- vlc_object_release( p_playlist );
- return;
+ /* */
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+
+ /* Start the playlist thread */
+ if( vlc_clone( &p_sys->thread, Thread, p_playlist,
+ VLC_THREAD_PRIORITY_LOW ) )
+ {
+ msg_Err( p_playlist, "cannot spawn playlist thread" );
}
- p_playlist->p_preparse->psz_object_name = strdup( "preparser" );
- p_playlist->p_preparse->i_waiting = 0;
- p_playlist->p_preparse->pp_waiting = NULL;
+ msg_Dbg( p_playlist, "Activated" );
+}
- vlc_object_set_destructor( p_playlist->p_preparse, PreparseDestructor );
+void playlist_Deactivate( playlist_t *p_playlist )
+{
+ /* */
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+
+ msg_Dbg( p_playlist, "Deactivate" );
+
+ PL_LOCK;
+ vlc_object_kill( p_playlist );
+ vlc_cond_signal( &p_sys->signal );
+ PL_UNLOCK;
- vlc_object_attach( p_playlist->p_preparse, p_playlist );
- if( vlc_thread_create( p_playlist->p_preparse, "preparser",
- RunPreparse, VLC_THREAD_PRIORITY_LOW, true ) )
+ vlc_join( p_sys->thread, NULL );
+ assert( !p_sys->p_input );
+
+ /* release input resources */
+ if( p_sys->p_input_resource )
{
- msg_Err( p_playlist, "cannot spawn preparse thread" );
- vlc_object_release( p_playlist->p_preparse );
- return;
+ input_resource_Terminate( p_sys->p_input_resource );
+ input_resource_Release( p_sys->p_input_resource );
}
+ p_sys->p_input_resource = NULL;
+
+ if( var_InheritBool( p_playlist, "media-library" ) )
+ playlist_MLDump( p_playlist );
+
+ PL_LOCK;
+
+ /* Release the current node */
+ set_current_status_node( p_playlist, NULL );
+
+ /* Release the current item */
+ set_current_status_item( p_playlist, NULL );
+
+ PL_UNLOCK;
+
+ msg_Dbg( p_playlist, "Deactivated" );
+}
+
+/* */
+
+/* Input Callback */
+static int InputEvent( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
+ playlist_t *p_playlist = p_data;
- // Secondary Preparse
- static const char fname[] = "fetcher";
- p_playlist->p_fetcher =
- vlc_custom_create( p_playlist, sizeof( playlist_fetcher_t ),
- VLC_OBJECT_GENERIC, fname );
- if( !p_playlist->p_fetcher )
+ if( newval.i_int != INPUT_EVENT_STATE &&
+ newval.i_int != INPUT_EVENT_DEAD )
+ return VLC_SUCCESS;
+
+ PL_LOCK;
+
+ /* XXX: signaling while not changing any parameter... suspicious... */
+ vlc_cond_signal( &pl_priv(p_playlist)->signal );
+
+ PL_UNLOCK;
+ return VLC_SUCCESS;
+}
+
+static void UpdateActivity( playlist_t *p_playlist, int i_delta )
+{
+ PL_ASSERT_LOCKED;
+
+ const int i_activity = var_GetInteger( p_playlist, "activity" ) ;
+ var_SetInteger( p_playlist, "activity", i_activity + i_delta );
+}
+
+/**
+ * Synchronise the current index of the playlist
+ * to match the index of the current item.
+ *
+ * \param p_playlist the playlist structure
+ * \param p_cur the current playlist item
+ * \return nothing
+ */
+static void ResyncCurrentIndex( playlist_t *p_playlist, playlist_item_t *p_cur )
+{
+ PL_ASSERT_LOCKED;
+
+ PL_DEBUG( "resyncing on %s", PLI_NAME( p_cur ) );
+ /* Simply resync index */
+ int i;
+ p_playlist->i_current_index = -1;
+ for( i = 0 ; i< p_playlist->current.i_size; i++ )
{
- msg_Err( p_playlist, "unable to create secondary preparser" );
- vlc_object_release( p_playlist );
- return;
+ if( ARRAY_VAL( p_playlist->current, i ) == p_cur )
+ {
+ p_playlist->i_current_index = i;
+ break;
+ }
}
- p_playlist->p_fetcher->psz_object_name = strdup( "fetcher" );
- p_playlist->p_fetcher->i_waiting = 0;
- p_playlist->p_fetcher->pp_waiting = NULL;
- p_playlist->p_fetcher->i_art_policy = var_CreateGetInteger( p_playlist,
- "album-art" );
+ PL_DEBUG( "%s is at %i", PLI_NAME( p_cur ), p_playlist->i_current_index );
+}
- vlc_object_set_destructor( p_playlist->p_fetcher, FetcherDestructor );
+static void ResetCurrentlyPlaying( playlist_t *p_playlist,
+ playlist_item_t *p_cur )
+{
+ playlist_private_t *p_sys = pl_priv(p_playlist);
- vlc_object_attach( p_playlist->p_fetcher, p_playlist );
- if( vlc_thread_create( p_playlist->p_fetcher,
- "fetcher",
- RunFetcher,
- VLC_THREAD_PRIORITY_LOW, true ) )
+ stats_TimerStart( p_playlist, "Items array build",
+ STATS_TIMER_PLAYLIST_BUILD );
+ PL_DEBUG( "rebuilding array of current - root %s",
+ PLI_NAME( p_sys->status.p_node ) );
+ ARRAY_RESET( p_playlist->current );
+ p_playlist->i_current_index = -1;
+ for( playlist_item_t *p_next = NULL; ; )
{
- msg_Err( p_playlist, "cannot spawn secondary preparse thread" );
- vlc_object_release( p_playlist->p_fetcher );
- return;
+ /** FIXME: this is *slow* */
+ p_next = playlist_GetNextLeaf( p_playlist,
+ p_sys->status.p_node,
+ p_next, true, false );
+ if( !p_next )
+ break;
+
+ if( p_next == p_cur )
+ p_playlist->i_current_index = p_playlist->current.i_size;
+ ARRAY_APPEND( p_playlist->current, p_next);
}
+ PL_DEBUG("rebuild done - %i items, index %i", p_playlist->current.i_size,
+ p_playlist->i_current_index);
- // Start the thread
- if( vlc_thread_create( p_playlist, "playlist", RunControlThread,
- VLC_THREAD_PRIORITY_LOW, true ) )
+ if( var_GetBool( p_playlist, "random" ) && ( p_playlist->current.i_size > 0 ) )
{
- msg_Err( p_playlist, "cannot spawn playlist thread" );
- vlc_object_release( p_playlist );
- return;
+ /* Shuffle the array */
+ for( unsigned j = p_playlist->current.i_size - 1; j > 0; j-- )
+ {
+ unsigned i = vlc_lrand48() % (j+1); /* between 0 and j */
+ playlist_item_t *p_tmp;
+ /* swap the two items */
+ p_tmp = ARRAY_VAL(p_playlist->current, i);
+ ARRAY_VAL(p_playlist->current,i) = ARRAY_VAL(p_playlist->current,j);
+ ARRAY_VAL(p_playlist->current,j) = p_tmp;
+ }
+ }
+ p_sys->b_reset_currently_playing = false;
+ stats_TimerStop( p_playlist, STATS_TIMER_PLAYLIST_BUILD );
+}
+
+
+/**
+ * Start the input for an item
+ *
+ * \param p_playlist the playlist object
+ * \param p_item the item to play
+ * \return nothing
+ */
+static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item )
+{
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+ input_item_t *p_input = p_item->p_input;
+
+ PL_ASSERT_LOCKED;
+
+ msg_Dbg( p_playlist, "creating new input thread" );
+
+ p_input->i_nb_played++;
+ set_current_status_item( p_playlist, p_item );
+
+ p_sys->status.i_status = PLAYLIST_RUNNING;
+
+ UpdateActivity( p_playlist, DEFAULT_INPUT_ACTIVITY );
+
+ assert( p_sys->p_input == NULL );
+
+ if( !p_sys->p_input_resource )
+ p_sys->p_input_resource = input_resource_New( VLC_OBJECT( p_playlist ) );
+ input_thread_t *p_input_thread = input_Create( p_playlist, p_input, NULL, p_sys->p_input_resource );
+ if( p_input_thread )
+ {
+ p_sys->p_input = p_input_thread;
+ var_AddCallback( p_input_thread, "intf-event", InputEvent, p_playlist );
+
+ var_SetAddress( p_playlist, "input-current", p_input_thread );
+
+ if( input_Start( p_sys->p_input ) )
+ {
+ vlc_object_release( p_input_thread );
+ p_sys->p_input = p_input_thread = NULL;
+ }
+ }
+
+ char *psz_uri = input_item_GetURI( p_item->p_input );
+ if( psz_uri && ( !strncmp( psz_uri, "directory:", 10 ) ||
+ !strncmp( psz_uri, "vlc:", 4 ) ) )
+ {
+ free( psz_uri );
+ return VLC_SUCCESS;
}
+ free( psz_uri );
- /* The object has been initialized, now attach it */
- vlc_object_attach( p_playlist, p_parent );
+ /* TODO store art policy in playlist private data */
+ if( var_GetInteger( p_playlist, "album-art" ) == ALBUM_ART_WHEN_PLAYED )
+ {
+ bool b_has_art;
+
+ char *psz_arturl, *psz_name;
+ psz_arturl = input_item_GetArtURL( p_input );
+ psz_name = input_item_GetName( p_input );
+
+ /* p_input->p_meta should not be null after a successfull CreateThread */
+ b_has_art = !EMPTY_STR( psz_arturl );
+
+ if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) )
+ {
+ PL_DEBUG( "requesting art for %s", psz_name );
+ playlist_AskForArtEnqueue( p_playlist, p_input );
+ }
+ free( psz_arturl );
+ free( psz_name );
+ }
+ /* FIXME: this is not safe !!*/
+ PL_UNLOCK;
+ var_SetAddress( p_playlist, "item-current", p_input );
+ PL_LOCK;
- return;
+ return VLC_SUCCESS;
}
/**
- * Run the main control thread itself
+ * Compute the next playlist item depending on
+ * the playlist course mode (forward, backward, random, view,...).
+ *
+ * \param p_playlist the playlist object
+ * \return nothing
*/
-static void* RunControlThread ( vlc_object_t *p_this )
+static playlist_item_t *NextItem( playlist_t *p_playlist )
{
- playlist_t *p_playlist = (playlist_t*)p_this;
- /* Tell above that we're ready */
- vlc_thread_ready( p_playlist );
+ playlist_private_t *p_sys = pl_priv(p_playlist);
+ playlist_item_t *p_new = NULL;
- vlc_object_lock( p_playlist );
- while( vlc_object_alive( p_playlist ) )
+ /* Handle quickly a few special cases */
+ /* No items to play */
+ if( p_playlist->items.i_size == 0 )
{
- playlist_MainLoop( p_playlist );
+ msg_Info( p_playlist, "playlist is empty" );
+ return NULL;
+ }
- /* The playlist lock has been unlocked, so we can't tell if
- * someone has killed us in the meantime. Check now. */
- if( !vlc_object_alive( p_playlist ) )
- break;
+ /* Start the real work */
+ if( p_sys->request.b_request )
+ {
+ p_new = p_sys->request.p_item;
+ int i_skip = p_sys->request.i_skip;
+ PL_DEBUG( "processing request item %s node %s skip %i",
+ PLI_NAME( p_sys->request.p_item ),
+ PLI_NAME( p_sys->request.p_node ), i_skip );
- if( p_playlist->b_cant_sleep )
+ if( p_sys->request.p_node &&
+ p_sys->request.p_node != get_current_status_node( p_playlist ) )
{
- /* 100 ms is an acceptable delay for playlist operations */
- vlc_object_unlock( p_playlist );
- msleep( INTF_IDLE_SLEEP*2 );
+ set_current_status_node( p_playlist, p_sys->request.p_node );
+ p_sys->request.p_node = NULL;
+ p_sys->b_reset_currently_playing = true;
+ }
- vlc_object_lock( p_playlist );
+ /* If we are asked for a node, go to it's first child */
+ if( i_skip == 0 && ( p_new == NULL || p_new->i_children != -1 ) )
+ {
+ i_skip++;
+ if( p_new != NULL )
+ {
+ p_new = playlist_GetNextLeaf( p_playlist, p_new, NULL, true, false );
+ for( int i = 0; i < p_playlist->current.i_size; i++ )
+ {
+ if( p_new == ARRAY_VAL( p_playlist->current, i ) )
+ {
+ p_playlist->i_current_index = i;
+ i_skip = 0;
+ }
+ }
+ }
}
+
+ if( p_sys->b_reset_currently_playing )
+ /* A bit too bad to reset twice ... */
+ ResetCurrentlyPlaying( p_playlist, p_new );
+ else if( p_new )
+ ResyncCurrentIndex( p_playlist, p_new );
else
+ p_playlist->i_current_index = -1;
+
+ if( p_playlist->current.i_size && (i_skip > 0) )
{
- vlc_object_wait( p_playlist );
+ if( p_playlist->i_current_index < -1 )
+ p_playlist->i_current_index = -1;
+ for( int i = i_skip; i > 0 ; i-- )
+ {
+ p_playlist->i_current_index++;
+ if( p_playlist->i_current_index >= p_playlist->current.i_size )
+ {
+ PL_DEBUG( "looping - restarting at beginning of node" );
+ p_playlist->i_current_index = 0;
+ }
+ }
+ p_new = ARRAY_VAL( p_playlist->current,
+ p_playlist->i_current_index );
}
+ else if( p_playlist->current.i_size && (i_skip < 0) )
+ {
+ for( int i = i_skip; i < 0 ; i++ )
+ {
+ p_playlist->i_current_index--;
+ if( p_playlist->i_current_index <= -1 )
+ {
+ PL_DEBUG( "looping - restarting at end of node" );
+ p_playlist->i_current_index = p_playlist->current.i_size-1;
+ }
+ }
+ p_new = ARRAY_VAL( p_playlist->current,
+ p_playlist->i_current_index );
+ }
+ /* Clear the request */
+ p_sys->request.b_request = false;
}
- vlc_object_unlock( p_playlist );
+ /* "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" );
- playlist_LastLoop( p_playlist );
- return NULL;
-}
+ /* 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;
+ }
-/*****************************************************************************
- * Preparse-specific functions
- *****************************************************************************/
-static void* RunPreparse ( vlc_object_t *p_this )
-{
- playlist_preparse_t *p_obj = (playlist_preparse_t*)p_this;
- /* Tell above that we're ready */
- vlc_thread_ready( p_obj );
- playlist_PreparseLoop( p_obj );
- 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 void* RunFetcher( vlc_object_t *p_this )
+static int LoopInput( playlist_t *p_playlist )
{
- playlist_fetcher_t *p_obj = (playlist_fetcher_t *)p_this;
- /* Tell above that we're ready */
- vlc_thread_ready( p_obj );
- playlist_FetcherLoop( p_obj );
- return NULL;
+ 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 PreparseDestructor( vlc_object_t * p_this )
+static void LoopRequest( playlist_t *p_playlist )
{
- playlist_preparse_t * p_preparse = (playlist_preparse_t *)p_this;
- free( p_preparse->pp_waiting );
- msg_Dbg( p_this, "Destroyed" );
+ 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 );
+ }
}
-static void FetcherDestructor( vlc_object_t * p_this )
+/**
+ * Run the main control thread itself
+ */
+static void *Thread ( void *data )
{
- playlist_fetcher_t * p_fetcher = (playlist_fetcher_t *)p_this;
- free( p_fetcher->pp_waiting );
- msg_Dbg( p_this, "Destroyed" );
+ 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 );
+
+ return NULL;
}
+
projects / vlc / blobdiff