/*****************************************************************************
- * control.c : Hanle control of the playlist & running through it
+ * 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 <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_playlist.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#define PLAYLIST_DEBUG 1
+#include <vlc_common.h>
+#include "vlc_playlist.h"
+#include "playlist_internal.h"
+#include <assert.h>
/*****************************************************************************
* 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_Yield( 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( pl != p_this /* This does not make sense to yield the playlist
+ using pl_Yield. use vlc_object_yield in this case */ );
+
+ if (pl)
+ vlc_object_yield (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( pl != p_this /* The rule is that pl_Release() should act on
+ the same object than pl_Yield() */ );
+
+ 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 )
{
- int i_view;
playlist_item_t *p_item, *p_node;
vlc_value_t val;
- if( p_playlist->i_size <= 0 )
- {
+ 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.b_request = true;
p_playlist->request.p_item = NULL;
break;
- case PLAYLIST_ITEMPLAY:
- p_item = (playlist_item_t *)va_arg( args, playlist_item_t * );
- if ( p_item == NULL || p_item->p_input->psz_uri == NULL )
- return VLC_EGENERIC;
- p_playlist->request.i_status = PLAYLIST_RUNNING;
- p_playlist->request.i_skip = 0;
- p_playlist->request.b_request = VLC_TRUE;
- p_playlist->request.p_item = p_item;
- p_playlist->request.p_node = p_playlist->status.p_node;
- break;
-
+ // Node can be null, it will keep the same. Use with care ...
+ // Item null = take the first child of node
case PLAYLIST_VIEWPLAY:
- i_view = (int) va_arg( args, playlist_item_t *);
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_playlist->status.i_status = PLAYLIST_STOPPED;
- p_playlist->request.b_request = VLC_TRUE;
- msg_Err( p_playlist, "null node" );
- return VLC_SUCCESS;
+ p_node = p_playlist->status.p_node;
+ 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.b_request = true;
p_playlist->request.p_node = p_node;
p_playlist->request.p_item = p_item;
+ if( p_item && var_GetBool( p_playlist, "random" ) )
+ p_playlist->b_reset_currently_playing = true;
break;
case PLAYLIST_PLAY:
- p_playlist->request.i_status = PLAYLIST_RUNNING;
- p_playlist->request.b_request = VLC_TRUE;
-
if( p_playlist->p_input )
{
val.i_int = PLAYING_S;
var_Set( p_playlist->p_input, "state", val );
break;
}
- 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;
- break;
-
- case PLAYLIST_AUTOPLAY:
- p_playlist->status.i_status = PLAYLIST_RUNNING;
- p_playlist->status.p_node = p_playlist->p_local_category;
- p_playlist->request.b_request = VLC_FALSE;
+ else
+ {
+ p_playlist->request.i_status = PLAYLIST_RUNNING;
+ p_playlist->request.b_request = true;
+ p_playlist->request.p_node = get_current_status_node( p_playlist );
+ p_playlist->request.p_item = get_current_status_item( p_playlist );
+ p_playlist->request.i_skip = 0;
+ }
break;
case PLAYLIST_PAUSE:
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.p_node = get_current_status_node( p_playlist );
+ p_playlist->request.p_item = get_current_status_item( p_playlist );
p_playlist->request.i_skip = (int) va_arg( args, int );
- p_playlist->request.b_request = VLC_TRUE;
+ /* 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 = true;
break;
default:
return VLC_EBADVAR;
break;
}
+ vlc_object_signal_maybe( VLC_OBJECT(p_playlist) );
return VLC_SUCCESS;
}
int playlist_PreparseEnqueue( playlist_t *p_playlist,
input_item_t *p_item )
{
- vlc_mutex_lock( &p_playlist->p_preparse->object_lock );
+ vlc_object_lock( p_playlist->p_preparse );
+ if( !vlc_object_alive( p_playlist->p_preparse ) )
+ {
+ vlc_object_unlock( p_playlist->p_preparse );
+ return VLC_EGENERIC;
+ }
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_object_signal_unlocked( p_playlist->p_preparse );
+ vlc_object_unlock( p_playlist->p_preparse );
return VLC_SUCCESS;
}
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 );
+ vlc_object_lock( p_playlist );
+ vlc_object_lock( p_playlist->p_preparse );
+ if( !vlc_object_alive( p_playlist->p_preparse ) )
+ {
+ vlc_object_unlock( p_playlist->p_preparse );
+ vlc_object_unlock( p_playlist );
+ return VLC_EGENERIC;
+ }
PreparseEnqueueItemSub( p_playlist, p_item );
- vlc_mutex_unlock( &p_playlist->p_preparse->object_lock );
- vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_unlock( p_playlist->p_preparse );
+ 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 )
+{
+ vlc_object_lock( p_playlist->p_fetcher );
+ if( !vlc_object_alive( p_playlist->p_fetcher ) )
+ {
+ vlc_object_unlock( p_playlist->p_fetcher );
+ return VLC_EGENERIC;
+ }
+
+ vlc_gc_incref( p_item );
+ INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
+ p_playlist->p_fetcher->i_waiting,
+ p_playlist->p_fetcher->i_waiting, p_item );
+ vlc_object_signal_unlocked( p_playlist->p_fetcher );
+ vlc_object_unlock( p_playlist->p_fetcher );
+ return VLC_SUCCESS;
+}
+
+static void PreparseEnqueueItemSub( playlist_t *p_playlist,
+ playlist_item_t *p_item )
{
int i;
if( p_item->i_children == -1 )
{
- vlc_gc_incref( p_item );
+ vlc_gc_incref( p_item->p_input );
INSERT_ELEM( p_playlist->p_preparse->pp_waiting,
p_playlist->p_preparse->i_waiting,
p_playlist->p_preparse->i_waiting,
{
for( i = 0; i < p_item->i_children; i++)
{
- PreparseEnqueueItemSub( p_playlist,
- p_item->pp_children[i] );
+ PreparseEnqueueItemSub( p_playlist, p_item->pp_children[i] );
}
}
}
* 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( 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,
+ 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;
+ }
+ }
+ 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,i;
+ 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( !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( !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 &&
- p_playlist->status.p_item->i_flags & PLAYLIST_SKIP_FLAG )
+ if( !p_playlist->request.b_request &&
+ get_current_status_item( p_playlist ) )
{
- msg_Dbg( p_playlist, "blocking item, stopping") ;
- return NULL;
- }
-
- /* 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 )
- msg_Err( p_playlist, "random unsupported" );
-#if 0
- &&
- ( !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 ) ) ) )
- {
- /* how many items to choose from ? */
- i_count = 0;
- for ( i = 0; i < p_playlist->i_size; i++ )
- {
- if ( p_playlist->pp_items[i]->p_input->i_nb_played == 0 )
- i_count++;
- }
- /* Nothing left? */
- if ( i_count == 0 )
+ playlist_item_t *p_parent = get_current_status_item( p_playlist );
+ while( p_parent )
{
- /* Don't loop? Exit! */
- if( !b_loop )
- return NULL;
- /* Otherwise reset the counter */
- for ( i = 0; i < p_playlist->i_size; i++ )
+ if( p_parent->i_flags & PLAYLIST_SKIP_FLAG )
{
- p_playlist->pp_items[i]->p_input->i_nb_played = 0;
+ msg_Dbg( p_playlist, "blocking item, stopping") ;
+ return NULL;
}
- i_count = p_playlist->i_size;
+ p_parent = p_parent->p_parent;
}
- srand( (unsigned int)mdate() );
- i = rand() % i_count + 1 ;
- /* loop thru the list and count down the unplayed items to the selected one */
- for ( i_new = 0; i_new < p_playlist->i_size && i > 0; i_new++ )
- {
- if ( p_playlist->pp_items[i_new]->p_input->i_nb_played == 0 )
- i--;
- }
- i_new--;
-
- p_playlist->request.i_skip = 0;
- p_playlist->request.b_request = VLC_FALSE;
- return p_playlist->pp_items[i_new];
}
-#endif
/* Start the real work */
if( p_playlist->request.b_request )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist,"processing request" );
-#endif
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 );
- p_playlist->status.p_node = p_playlist->request.p_node;
-
- /* If we are asked for a node, take its first item */
- if( i_skip == 0 &&
- ( p_new == NULL || p_new->i_children != -1 ) )
+ if( p_playlist->request.p_node &&
+ p_playlist->request.p_node != get_current_status_node( p_playlist ) )
{
- i_skip++;
+
+ set_current_status_node( p_playlist, p_playlist->request.p_node );
+ p_playlist->request.p_node = NULL;
+ p_playlist->b_reset_currently_playing = true;
}
- if( i_skip > 0 )
+ /* If we are asked for a node, don't take it */
+ if( i_skip == 0 && ( p_new == NULL || p_new->i_children != -1 ) )
+ i_skip++;
+
+ if( 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( 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_GetNextEnabledLeaf( p_playlist,
- p_playlist->request.p_node,
- p_new );
- if( p_new == NULL )
+ p_playlist->i_current_index++;
+ if( p_playlist->i_current_index >= p_playlist->current.i_size )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "looping - restarting at beginning "
- "of node" );
-#endif
- p_new = playlist_GetNextLeaf( p_playlist,
- p_playlist->request.p_node,
- NULL );
- if( p_new == NULL ) break;
+ 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( 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 );
- if( p_new == NULL )
+ p_playlist->i_current_index--;
+ if( p_playlist->i_current_index <= -1 )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "looping - restarting at end "
- "of node" );
-#endif
- /** \bug This is needed because GetPrevLeaf does not loop
- * by itself */
- p_new = playlist_GetLastLeaf( p_playlist,
- p_playlist->request.p_node );
+ PL_DEBUG( "looping - restarting at end of 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;
+ p_playlist->request.b_request = false;
}
/* "Automatic" item change ( next ) */
else
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist,"changing item without a request" );
-#endif
+ 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 );
- if( p_new == NULL && b_loop )
+ if( 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 )
{
-#ifdef PLAYLIST_DEBUG
- msg_Dbg( p_playlist, "looping" );
-#endif
- p_new = playlist_GetNextLeaf( p_playlist,
- p_playlist->status.p_node,
- NULL );
+ 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 objetc
+ * \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 = &libvlc_priv(p_playlist->p_libvlc)->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;
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( p_playlist->p_fetcher &&
+ p_playlist->p_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;
}