X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fcontrol.c;h=88985c0c276992a096bb9439d20f8219aeef6170;hb=76c03d8c60bdce1def93685cc3d3a187c802dfb6;hp=c4b4006024c2118048f8fa58eda3e2635e6ea39b;hpb=3a2e81d03df5330334c2267a8409414cca0d61fa;p=vlc diff --git a/src/playlist/control.c b/src/playlist/control.c index c4b4006024..88985c0c27 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -2,7 +2,7 @@ * control.c : Handle control of the playlist & running through it ***************************************************************************** * Copyright (C) 1999-2004 the VideoLAN team - * $Id: /local/vlc/0.8.6-playlist-vlm/src/playlist/playlist.c 13741 2006-03-21T19:29:39.792444Z zorglub $ + * $Id$ * * Authors: Samuel Hocevar * Clément Stenac @@ -21,8 +21,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "vlc_playlist.h" #include "playlist_internal.h" #include @@ -30,156 +33,151 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ); - -void PreparseEnqueueItemSub( playlist_t *, playlist_item_t * ); +static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ); -playlist_item_t *playlist_RecursiveFindLast(playlist_t *p_playlist, - playlist_item_t *p_node ); +static void PreparseEnqueueItemSub( playlist_t *, playlist_item_t * ); /***************************************************************************** * Playlist control *****************************************************************************/ -/** - * Do a playlist action. Should be entered without playlist lock - * \see playlist_Control - */ -int playlist_LockControl( playlist_t * p_playlist, int i_query, ... ) +playlist_t *__pl_Hold( vlc_object_t *p_this ) { - va_list args; - int i_result; - va_start( args, i_query ); - vlc_mutex_lock( &p_playlist->object_lock ); - i_result = PlaylistVAControl( p_playlist, i_query, args ); - va_end( args ); - vlc_mutex_unlock( &p_playlist->object_lock ); - return i_result; + playlist_t *pl; + + barrier (); + pl = libvlc_priv (p_this->p_libvlc)->p_playlist; + + assert( VLC_OBJECT(pl) != p_this /* This does not make sense to hold the playlist + using pl_Hold. use vlc_object_hold in this case */ ); + + if (pl) + vlc_object_hold (pl); + return pl; } -/** - * Do a playlist action. - * If there is something in the playlist then you can do playlist actions. - * Should be entered with playlist lock. See include/vlc_playlist.h for - * possible queries - * - * \param p_playlist the playlist to do the command on - * \param i_query the command to do - * \param variable number of arguments - * \return VLC_SUCCESS or an error - */ -int playlist_Control( playlist_t * p_playlist, int i_query, ... ) +void __pl_Release( vlc_object_t *p_this ) +{ + playlist_t *pl = libvlc_priv (p_this->p_libvlc)->p_playlist; + assert( pl != NULL ); + + assert( VLC_OBJECT(pl) != p_this /* The rule is that pl_Release() should act on + the same object than pl_Hold() */ ); + + vlc_object_release( pl ); +} + +int playlist_Control( playlist_t * p_playlist, int i_query, + bool b_locked, ... ) { va_list args; int i_result; - va_start( args, i_query ); + va_start( args, b_locked ); + PL_LOCK_IF( !b_locked ); i_result = PlaylistVAControl( p_playlist, i_query, args ); va_end( args ); + PL_UNLOCK_IF( !b_locked ); return i_result; } -int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ) +static int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ) { playlist_item_t *p_item, *p_node; vlc_value_t val; - if( p_playlist->i_size <= 0 ) - { + PL_ASSERT_LOCKED; + + if( !vlc_object_alive( p_playlist ) ) + return VLC_EGENERIC; + + if( playlist_IsEmpty( p_playlist ) ) return VLC_EGENERIC; - } switch( i_query ) { case PLAYLIST_STOP: - p_playlist->request.i_status = PLAYLIST_STOPPED; - p_playlist->request.b_request = VLC_TRUE; - p_playlist->request.p_item = NULL; + pl_priv(p_playlist)->request.i_status = PLAYLIST_STOPPED; + pl_priv(p_playlist)->request.b_request = true; + pl_priv(p_playlist)->request.p_item = NULL; break; // Node can be null, it will keep the same. Use with care ... // Item null = take the first child of node case PLAYLIST_VIEWPLAY: - p_playlist->b_reset_random = VLC_TRUE; p_node = (playlist_item_t *)va_arg( args, playlist_item_t * ); p_item = (playlist_item_t *)va_arg( args, playlist_item_t * ); if ( p_node == NULL ) { - p_node = p_playlist->status.p_node; + p_node = get_current_status_node( p_playlist ); assert( p_node ); } - p_playlist->request.i_status = PLAYLIST_RUNNING; - p_playlist->request.i_skip = 0; - p_playlist->request.b_request = VLC_TRUE; - p_playlist->request.p_node = p_node; - p_playlist->request.p_item = p_item; + pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; + pl_priv(p_playlist)->request.i_skip = 0; + pl_priv(p_playlist)->request.b_request = true; + pl_priv(p_playlist)->request.p_node = p_node; + pl_priv(p_playlist)->request.p_item = p_item; + if( p_item && var_GetBool( p_playlist, "random" ) ) + pl_priv(p_playlist)->b_reset_currently_playing = true; break; case PLAYLIST_PLAY: - if( p_playlist->p_input ) + if( pl_priv(p_playlist)->p_input ) { val.i_int = PLAYING_S; - var_Set( p_playlist->p_input, "state", val ); + var_Set( pl_priv(p_playlist)->p_input, "state", val ); break; } else { - p_playlist->request.i_status = PLAYLIST_RUNNING; - p_playlist->request.b_request = VLC_TRUE; - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.p_item = p_playlist->status.p_item; - p_playlist->request.i_skip = 0; + pl_priv(p_playlist)->request.i_status = PLAYLIST_RUNNING; + pl_priv(p_playlist)->request.b_request = true; + pl_priv(p_playlist)->request.p_node = get_current_status_node( p_playlist ); + pl_priv(p_playlist)->request.p_item = get_current_status_item( p_playlist ); + pl_priv(p_playlist)->request.i_skip = 0; } break; - case PLAYLIST_AUTOPLAY: - // AUTOPLAY is an ugly hack for initial status. - // Hopefully it will disappear - p_playlist->status.i_status = PLAYLIST_RUNNING; - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.b_request = VLC_FALSE; - break; - case PLAYLIST_PAUSE: val.i_int = 0; - if( p_playlist->p_input ) - var_Get( p_playlist->p_input, "state", &val ); + if( pl_priv(p_playlist)->p_input ) + var_Get( pl_priv(p_playlist)->p_input, "state", &val ); if( val.i_int == PAUSE_S ) { - p_playlist->status.i_status = PLAYLIST_RUNNING; - if( p_playlist->p_input ) + pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING; + if( pl_priv(p_playlist)->p_input ) { val.i_int = PLAYING_S; - var_Set( p_playlist->p_input, "state", val ); + var_Set( pl_priv(p_playlist)->p_input, "state", val ); } } else { - p_playlist->status.i_status = PLAYLIST_PAUSED; - if( p_playlist->p_input ) + pl_priv(p_playlist)->status.i_status = PLAYLIST_PAUSED; + if( pl_priv(p_playlist)->p_input ) { val.i_int = PAUSE_S; - var_Set( p_playlist->p_input, "state", val ); + var_Set( pl_priv(p_playlist)->p_input, "state", val ); } } break; case PLAYLIST_SKIP: - p_playlist->request.p_node = p_playlist->status.p_node; - p_playlist->request.p_item = p_playlist->status.p_item; - p_playlist->request.i_skip = (int) va_arg( args, int ); + pl_priv(p_playlist)->request.p_node = get_current_status_node( p_playlist ); + pl_priv(p_playlist)->request.p_item = get_current_status_item( p_playlist ); + pl_priv(p_playlist)->request.i_skip = (int) va_arg( args, int ); /* if already running, keep running */ - if( p_playlist->status.i_status != PLAYLIST_STOPPED ) - p_playlist->request.i_status = p_playlist->status.i_status; - p_playlist->request.b_request = VLC_TRUE; + if( pl_priv(p_playlist)->status.i_status != PLAYLIST_STOPPED ) + pl_priv(p_playlist)->request.i_status = pl_priv(p_playlist)->status.i_status; + pl_priv(p_playlist)->request.b_request = true; break; default: msg_Err( p_playlist, "unknown playlist query" ); return VLC_EBADVAR; - break; } + vlc_object_signal_unlocked( p_playlist ); return VLC_SUCCESS; } @@ -191,47 +189,68 @@ int PlaylistVAControl( playlist_t * p_playlist, int i_query, va_list args ) int playlist_PreparseEnqueue( playlist_t *p_playlist, input_item_t *p_item ) { - vlc_mutex_lock( &p_playlist->p_preparse->object_lock ); + playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse; + vlc_gc_incref( p_item ); - INSERT_ELEM( p_playlist->p_preparse->pp_waiting, - p_playlist->p_preparse->i_waiting, - p_playlist->p_preparse->i_waiting, - p_item ); - vlc_mutex_unlock( &p_playlist->p_preparse->object_lock ); + + vlc_mutex_lock( &p_preparse->lock ); + INSERT_ELEM( p_preparse->pp_waiting, p_preparse->i_waiting, + p_preparse->i_waiting, p_item ); + vlc_cond_signal( &p_preparse->wait ); + vlc_mutex_unlock( &p_preparse->lock ); return VLC_SUCCESS; } -/** Enqueue a playlist item or a node for peparsing. - * This function should be entered without playlist and preparser locks */ +/** Enqueue a playlist item or a node for preparsing. + * This function shall be called without playlist and preparser locks */ int playlist_PreparseEnqueueItem( playlist_t *p_playlist, playlist_item_t *p_item ) { - vlc_mutex_lock( &p_playlist->object_lock ); - vlc_mutex_lock( &p_playlist->p_preparse->object_lock ); + playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse; + + vlc_object_lock( p_playlist ); + vlc_mutex_lock( &p_preparse->lock ); PreparseEnqueueItemSub( p_playlist, p_item ); - vlc_mutex_unlock( &p_playlist->p_preparse->object_lock ); - vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_mutex_unlock( &p_preparse->lock ); + vlc_object_unlock( p_playlist ); return VLC_SUCCESS; } -void PreparseEnqueueItemSub( playlist_t *p_playlist, - playlist_item_t *p_item ) +int playlist_AskForArtEnqueue( playlist_t *p_playlist, + input_item_t *p_item ) { - int i; + playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher; + + vlc_gc_incref( p_item ); + + vlc_mutex_lock( &p_fetcher->lock ); + INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, + p_fetcher->i_waiting, p_item ); + vlc_cond_signal( &p_fetcher->wait ); + vlc_mutex_unlock( &p_fetcher->lock ); + return VLC_SUCCESS; +} + +static void PreparseEnqueueItemSub( playlist_t *p_playlist, + playlist_item_t *p_item ) +{ + playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse; + if( p_item->i_children == -1 ) { - vlc_gc_incref( p_item ); - INSERT_ELEM( p_playlist->p_preparse->pp_waiting, - p_playlist->p_preparse->i_waiting, - p_playlist->p_preparse->i_waiting, + /* Leaf item */ + vlc_gc_incref( p_item->p_input ); + INSERT_ELEM( p_preparse->pp_waiting, + p_preparse->i_waiting, + p_preparse->i_waiting, p_item->p_input ); } else { - for( i = 0; i < p_item->i_children; i++) + /* Non-leaf item: recurse */ + for( int i = 0; i < p_item->i_children; i++) { - PreparseEnqueueItemSub( p_playlist, - p_item->pp_children[i] ); + PreparseEnqueueItemSub( p_playlist, p_item->pp_children[i] ); } } } @@ -240,42 +259,118 @@ void PreparseEnqueueItemSub( playlist_t *p_playlist, * Playback logic *****************************************************************************/ -/** This function calculates the next playlist item, depending - * on the playlist course mode (forward, backward, random, view,...). */ +/** + * 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_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++ ) + { + if( ARRAY_VAL( p_playlist->current, i ) == p_cur ) + { + p_playlist->i_current_index = i; + break; + } + } + PL_DEBUG( "%s is at %i", PLI_NAME( p_cur ), p_playlist->i_current_index ); +} + +void ResetCurrentlyPlaying( playlist_t *p_playlist, bool b_random, + playlist_item_t *p_cur ) +{ + playlist_item_t *p_next = NULL; + stats_TimerStart( p_playlist, "Items array build", + STATS_TIMER_PLAYLIST_BUILD ); + PL_DEBUG( "rebuilding array of current - root %s", + PLI_NAME( pl_priv(p_playlist)->status.p_node ) ); + ARRAY_RESET( p_playlist->current ); + p_playlist->i_current_index = -1; + while( 1 ) + { + /** FIXME: this is *slow* */ + p_next = playlist_GetNextLeaf( p_playlist, + pl_priv(p_playlist)->status.p_node, + p_next, true, false ); + if( p_next ) + { + if( p_next == p_cur ) + p_playlist->i_current_index = p_playlist->current.i_size; + ARRAY_APPEND( p_playlist->current, p_next); + } + else break; + } + PL_DEBUG("rebuild done - %i items, index %i", p_playlist->current.i_size, + p_playlist->i_current_index); + if( b_random ) + { + /* Shuffle the array */ + srand( (unsigned int)mdate() ); + int j; + for( j = p_playlist->current.i_size - 1; j > 0; j-- ) + { + int i = rand() % (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; + } + } + pl_priv(p_playlist)->b_reset_currently_playing = false; + stats_TimerStop( p_playlist, STATS_TIMER_PLAYLIST_BUILD ); +} + +/** + * Compute the next playlist item depending on + * the playlist course mode (forward, backward, random, view,...). + * + * \param p_playlist the playlist object + * \return nothing + */ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) { playlist_item_t *p_new = NULL; int i_skip = 0, i; - vlc_bool_t b_loop = var_GetBool( p_playlist, "loop" ); - vlc_bool_t b_random = var_GetBool( p_playlist, "random" ); - vlc_bool_t b_repeat = var_GetBool( p_playlist, "repeat" ); - vlc_bool_t b_playstop = var_GetBool( p_playlist, "play-and-stop" ); + bool b_loop = var_GetBool( p_playlist, "loop" ); + bool b_random = var_GetBool( p_playlist, "random" ); + bool b_repeat = var_GetBool( p_playlist, "repeat" ); + bool b_playstop = var_GetBool( p_playlist, "play-and-stop" ); /* Handle quickly a few special cases */ /* No items to play */ - if( p_playlist->i_size == 0 ) + if( p_playlist->items.i_size == 0 ) { msg_Info( p_playlist, "playlist is empty" ); return NULL; } /* Repeat and play/stop */ - if( !p_playlist->request.b_request && b_repeat == VLC_TRUE && - p_playlist->status.p_item ) + if( !pl_priv(p_playlist)->request.b_request && b_repeat == true && + get_current_status_item( p_playlist ) ) { msg_Dbg( p_playlist,"repeating item" ); - return p_playlist->status.p_item; + return get_current_status_item( p_playlist ); } - if( !p_playlist->request.b_request && b_playstop == VLC_TRUE ) + if( !pl_priv(p_playlist)->request.b_request && b_playstop == true ) { - msg_Dbg( p_playlist,"stopping (play and stop)"); + msg_Dbg( p_playlist,"stopping (play and stop)" ); return NULL; } - if( !p_playlist->request.b_request && p_playlist->status.p_item ) + if( !pl_priv(p_playlist)->request.b_request && + get_current_status_item( p_playlist ) ) { - playlist_item_t *p_parent = p_playlist->status.p_item; + playlist_item_t *p_parent = get_current_status_item( p_playlist ); while( p_parent ) { if( p_parent->i_flags & PLAYLIST_SKIP_FLAG ) @@ -287,181 +382,177 @@ playlist_item_t * playlist_NextItem( playlist_t *p_playlist ) } } - /* Random case. This is an exception: if request, but request is skip +- 1 - * we don't go to next item but select a new random one. */ - if( b_random && - ( !p_playlist->request.b_request || - ( p_playlist->request.b_request && - ( p_playlist->request.p_item == NULL || - p_playlist->request.i_skip == 1 || - p_playlist->request.i_skip == -1 ) ) ) ) + /* Start the real work */ + if( pl_priv(p_playlist)->request.b_request ) { - PL_DEBUG( "doing random, have %i items, currently at %i, reset %i\n", - p_playlist->i_random, p_playlist->i_random_index, - p_playlist->b_reset_random ); - if( p_playlist->b_reset_random ) + p_new = pl_priv(p_playlist)->request.p_item; + i_skip = pl_priv(p_playlist)->request.i_skip; + PL_DEBUG( "processing request item %s node %s skip %i", + PLI_NAME( pl_priv(p_playlist)->request.p_item ), + PLI_NAME( pl_priv(p_playlist)->request.p_node ), i_skip ); + + if( pl_priv(p_playlist)->request.p_node && + pl_priv(p_playlist)->request.p_node != get_current_status_node( p_playlist ) ) { - int j; - FREE( p_playlist->pp_random ); - if( !p_playlist->b_reset_random && !b_loop ) goto end; - p_playlist->i_random = 0; - p_playlist->i_random_index = 0; - p_playlist->i_random = playlist_GetAllEnabledChildren( - p_playlist, - p_playlist->status.p_node, - &p_playlist->pp_random ); - /* Shuffle the array */ - srand( (unsigned int)mdate() ); - int swap = 0; - for( j = p_playlist->i_random -1; j > 0; j-- ) - { - swap++; - int i = rand() % (j+1); /* between 0 and j */ - playlist_item_t *p_tmp; - p_tmp = p_playlist->pp_random[i]; - p_playlist->pp_random[i] = p_playlist->pp_random[j]; - p_playlist->pp_random[j] = p_tmp; - } - p_playlist->b_reset_random = VLC_FALSE; - PL_DEBUG( "random rebuilt, have %i items", p_playlist->i_random ); + + set_current_status_node( p_playlist, pl_priv(p_playlist)->request.p_node ); + pl_priv(p_playlist)->request.p_node = NULL; + pl_priv(p_playlist)->b_reset_currently_playing = true; } - else + + /* 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 ) ) { - /* Go backward or forward */ - if( !p_playlist->request.b_request || !p_playlist->request.p_item || - p_playlist->request.i_skip == 1 ) - p_playlist->i_random_index++; - else - p_playlist->i_random_index--; - /* Handle bounds situations */ - if( p_playlist->i_random_index == -1 ) - { - if( !b_loop || p_playlist->i_random == 0 ) goto end; - p_playlist->i_random_index = p_playlist->i_random - 1; - } - else if( p_playlist->i_random_index == p_playlist->i_random ) + i_skip++; + if( p_new != NULL ) { - if( !b_loop || p_playlist->i_random == 0 ) goto end; - p_playlist->i_random_index = 0; + p_new = playlist_GetNextLeaf( p_playlist, p_new, NULL, true, false ); + for( 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; + } + } } } - PL_DEBUG( "using random item %i", p_playlist->i_random_index ); - if ( p_playlist->i_random == 0 ) goto end; /* Can this happen ?? */ - p_new = p_playlist->pp_random[p_playlist->i_random_index]; -end: - if( !p_new ) p_playlist->b_reset_random = VLC_TRUE; - p_playlist->request.i_skip = 0; - p_playlist->request.b_request = VLC_FALSE; - return p_new; - } - - /* Start the real work */ - if( p_playlist->request.b_request ) - { - p_new = p_playlist->request.p_item; - i_skip = p_playlist->request.i_skip; - PL_DEBUG( "processing request item %s node %s skip %i", - PLI_NAME( p_playlist->request.p_item ), - PLI_NAME( p_playlist->request.p_node ), i_skip ); - if( p_playlist->request.p_node ) - p_playlist->status.p_node = p_playlist->request.p_node; - - /* If we are asked for a node, dont take it */ - if( i_skip == 0 && ( p_new == NULL || p_new->i_children != -1 ) ) - i_skip++; + if( pl_priv(p_playlist)->b_reset_currently_playing ) + /* A bit too bad to reset twice ... */ + ResetCurrentlyPlaying( p_playlist, b_random, p_new ); + else if( p_new ) + ResyncCurrentIndex( p_playlist, p_new ); + else + p_playlist->i_current_index = -1; - if( i_skip > 0 ) + if( p_playlist->current.i_size && (i_skip > 0) ) { + if( p_playlist->i_current_index < -1 ) + p_playlist->i_current_index = -1; for( i = i_skip; i > 0 ; i-- ) { - p_new = playlist_GetNextLeaf( p_playlist, - p_playlist->request.p_node, - p_new, VLC_TRUE, VLC_FALSE ); - if( p_new == NULL ) + 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_new = playlist_GetNextLeaf( p_playlist, - p_playlist->request.p_node, - NULL, VLC_TRUE, VLC_FALSE); - if( p_new == NULL ) break; + p_playlist->i_current_index = 0; } } + p_new = ARRAY_VAL( p_playlist->current, + p_playlist->i_current_index ); } - else if( i_skip < 0 ) + else if( p_playlist->current.i_size && (i_skip < 0) ) { for( i = i_skip; i < 0 ; i++ ) { - p_new = playlist_GetPrevLeaf( p_playlist, - p_playlist->request.p_node, - p_new, VLC_FALSE, VLC_FALSE ); - if( p_new == NULL ) + p_playlist->i_current_index--; + if( p_playlist->i_current_index <= -1 ) { PL_DEBUG( "looping - restarting at end of node" ); - /** \bug This is needed because GetPrevLeaf does not loop - * by itself */ - p_new = playlist_GetLastLeaf( p_playlist, - p_playlist->request.p_node ); + p_playlist->i_current_index = p_playlist->current.i_size-1; } - if( p_new == NULL ) break; } + p_new = ARRAY_VAL( p_playlist->current, + p_playlist->i_current_index ); } /* Clear the request */ - p_playlist->request.b_request = VLC_FALSE; + pl_priv(p_playlist)->request.b_request = false; } /* "Automatic" item change ( next ) */ else { - PL_DEBUG( "changing item without a request" ); + 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( p_playlist->status.p_item && - p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG ) + if( get_current_status_item( p_playlist ) && + get_current_status_item( p_playlist )->i_flags & PLAYLIST_SKIP_FLAG ) return NULL; - p_new = playlist_GetNextLeaf( p_playlist, - p_playlist->status.p_node, - p_playlist->status.p_item, - VLC_TRUE, VLC_FALSE ); - if( p_new == NULL && b_loop ) + if( pl_priv(p_playlist)->b_reset_currently_playing ) + ResetCurrentlyPlaying( p_playlist, b_random, + 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 ) { - PL_DEBUG( "looping" ); - p_new = playlist_GetNextLeaf( p_playlist, - p_playlist->status.p_node, - NULL, VLC_TRUE, VLC_FALSE ); + 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; } - if( p_new == NULL ) - { - msg_Dbg( p_playlist, "did not find something to play" ); - } return p_new; } -/** Start the input for an item */ +/** + * Start the input for an item + * + * \param p_playlist the playlist object + * \param p_item the item to play + * \return nothing + */ int playlist_PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) { - vlc_value_t val; - int i_activity = var_GetInteger( p_playlist, "activity") ; + input_item_t *p_input = p_item->p_input; + sout_instance_t **pp_sout = &pl_priv(p_playlist)->p_sout; + int i_activity = var_GetInteger( p_playlist, "activity" ) ; msg_Dbg( p_playlist, "creating new input thread" ); - p_item->p_input->i_nb_played++; - p_playlist->status.p_item = p_item; + p_input->i_nb_played++; + set_current_status_item( p_playlist, p_item ); - p_playlist->status.i_status = PLAYLIST_RUNNING; + pl_priv(p_playlist)->status.i_status = PLAYLIST_RUNNING; var_SetInteger( p_playlist, "activity", i_activity + DEFAULT_INPUT_ACTIVITY ); - p_playlist->p_input = input_CreateThread( p_playlist, p_item->p_input ); - val.i_int = p_item->p_input->i_id; - /* unlock the playlist to set the var...mmm */ - vlc_mutex_unlock( &p_playlist->object_lock); - var_Set( p_playlist, "playlist-current", val); - vlc_mutex_lock( &p_playlist->object_lock); + input_thread_t * p_input_thread = + input_CreateThreadExtended( p_playlist, p_input, NULL, *pp_sout ); + playlist_set_current_input( p_playlist, p_input_thread ); + vlc_object_release( p_input_thread ); + + *pp_sout = 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 ); + + if( pl_priv(p_playlist)->fetcher.i_art_policy == 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 ); + } + + PL_UNLOCK; + var_SetInteger( p_playlist, "playlist-current", p_input->i_id ); + PL_LOCK; return VLC_SUCCESS; }