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;
{
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 );
}
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;
}
{
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.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;
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 );
/* if already running, keep running */
if( p_playlist->status.i_status != PLAYLIST_STOPPED )
input_item_t *p_item )
{
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,
{
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_object_unlock( p_playlist->p_preparse );
vlc_object_unlock( p_playlist );
int playlist_AskForArtEnqueue( playlist_t *p_playlist,
input_item_t *p_item )
{
- int i;
-
vlc_object_lock( p_playlist->p_fetcher );
- for( i = 0; i < p_playlist->p_fetcher->i_waiting ; i++ );
+ 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,
- i, p_item );
+ 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;
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,
/* Repeat and play/stop */
if( !p_playlist->request.b_request && b_repeat == true &&
- p_playlist->status.p_item )
+ 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 )
{
return NULL;
}
- if( !p_playlist->request.b_request && p_playlist->status.p_item )
+ if( !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 )
PLI_NAME( p_playlist->request.p_item ),
PLI_NAME( 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 )
+ 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, p_playlist->request.p_node );
+ p_playlist->request.p_node = NULL;
p_playlist->b_reset_currently_playing = true;
}
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 );
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;