* Playlist control
*****************************************************************************/
-playlist_t *__pl_Yield( vlc_object_t *p_this )
+playlist_t *__pl_Hold( vlc_object_t *p_this )
{
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_yield (pl);
+ vlc_object_hold (pl);
return pl;
}
{
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 );
}
va_list args;
int i_result;
va_start( args, b_locked );
- if( !b_locked ) PL_LOCK;
+ PL_LOCK_IF( !b_locked );
i_result = PlaylistVAControl( p_playlist, i_query, args );
va_end( args );
- if( !b_locked ) PL_UNLOCK;
+ PL_UNLOCK_IF( !b_locked );
return i_result;
}
playlist_item_t *p_item, *p_node;
vlc_value_t val;
+ PL_ASSERT_LOCKED;
+
if( !vlc_object_alive( p_playlist ) )
return VLC_EGENERIC;
switch( i_query )
{
case PLAYLIST_STOP:
- p_playlist->request.i_status = PLAYLIST_STOPPED;
- p_playlist->request.b_request = 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 ...
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 = 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" ) )
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 = 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_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 = 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_maybe( VLC_OBJECT(p_playlist) );
+ vlc_object_signal_unlocked( p_playlist );
return VLC_SUCCESS;
}
int playlist_PreparseEnqueue( playlist_t *p_playlist,
input_item_t *p_item )
{
- vlc_object_lock( p_playlist->p_preparse );
+ 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_object_signal_unlocked( p_playlist->p_preparse );
- vlc_object_unlock( p_playlist->p_preparse );
+
+ 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 )
{
+ playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
+
vlc_object_lock( p_playlist );
- vlc_object_lock( p_playlist->p_preparse );
+ vlc_mutex_lock( &p_preparse->lock );
PreparseEnqueueItemSub( p_playlist, p_item );
- vlc_object_unlock( p_playlist->p_preparse );
+ vlc_mutex_unlock( &p_preparse->lock );
vlc_object_unlock( p_playlist );
return VLC_SUCCESS;
}
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_object_lock( p_playlist->p_fetcher );
- for( i = 0; i < p_playlist->p_fetcher->i_waiting ; i++ );
vlc_gc_incref( p_item );
- INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
- p_playlist->p_fetcher->i_waiting,
- i, p_item );
- vlc_object_signal_unlocked( p_playlist->p_fetcher );
- vlc_object_unlock( p_playlist->p_fetcher );
+
+ 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 )
{
- int i;
+ 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] );
}
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 ) );
+ 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,
- p_playlist->status.p_node,
+ pl_priv(p_playlist)->status.p_node,
p_next, true, false );
if( p_next )
{
}
/* Repeat and play/stop */
- if( !p_playlist->request.b_request && b_repeat == 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 == true )
+ if( !pl_priv(p_playlist)->request.b_request && b_playstop == true )
{
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 )
}
/* Start the real work */
- if( p_playlist->request.b_request )
+ if( pl_priv(p_playlist)->request.b_request )
{
- p_new = p_playlist->request.p_item;
- i_skip = p_playlist->request.i_skip;
+ 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( p_playlist->request.p_item ),
- PLI_NAME( p_playlist->request.p_node ), i_skip );
+ PLI_NAME( pl_priv(p_playlist)->request.p_item ),
+ PLI_NAME( pl_priv(p_playlist)->request.p_node ), i_skip );
- /* Make sure the node wasn't deleted */
- if( p_playlist->status.p_node &&
- p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
- {
- PL_DEBUG( "%s was marked for deletion, deleting",
- PLI_NAME( p_playlist->status.p_node ) );
- playlist_ItemDelete( p_playlist->status.p_node );
- /* Don't attempt to reuse that node */
- if( p_playlist->status.p_node == p_playlist->request.p_node )
- p_playlist->request.p_node = NULL;
- p_playlist->status.p_node = NULL;
- }
-
- if( p_playlist->request.p_node &&
- p_playlist->request.p_node != p_playlist->status.p_node )
+ if( pl_priv(p_playlist)->request.p_node &&
+ pl_priv(p_playlist)->request.p_node != get_current_status_node( p_playlist ) )
{
- p_playlist->status.p_node = p_playlist->request.p_node;
+ set_current_status_node( p_playlist, pl_priv(p_playlist)->request.p_node );
+ pl_priv(p_playlist)->request.p_node = NULL;
p_playlist->b_reset_currently_playing = true;
}
- /* If we are asked for a node, don't take it */
+ /* 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( 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_playlist->b_reset_currently_playing )
/* A bit too bad to reset twice ... */
p_playlist->i_current_index );
}
/* Clear the request */
- p_playlist->request.b_request = false;
+ pl_priv(p_playlist)->request.b_request = false;
}
/* "Automatic" item change ( next ) */
else
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;
if( p_playlist->b_reset_currently_playing )
ResetCurrentlyPlaying( p_playlist, b_random,
- p_playlist->status.p_item );
+ get_current_status_item( p_playlist ) );
p_playlist->i_current_index++;
assert( p_playlist->i_current_index <= p_playlist->current.i_size );
/**
* Start the input for an item
*
- * \param p_playlist the playlist objetc
+ * \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 )
{
input_item_t *p_input = p_item->p_input;
- sout_instance_t **pp_sout = &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+ 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_input->i_nb_played++;
- p_playlist->status.p_item = p_item;
+ 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 );
}
free( psz_uri );
- if( p_playlist->p_fetcher &&
- p_playlist->p_fetcher->i_art_policy == ALBUM_ART_WHEN_PLAYED )
+ if( pl_priv(p_playlist)->fetcher.i_art_policy == ALBUM_ART_WHEN_PLAYED )
{
bool b_has_art;
projects / vlc / blobdiff