playlist_t *__pl_Yield( vlc_object_t *p_this )
{
- playlist_t *pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
- assert( pl != NULL );
- vlc_object_yield( pl );
+ playlist_t *pl;
+
+ barrier ();
+ pl = libvlc_priv (p_this->p_libvlc)->p_playlist;
+ if (pl)
+ vlc_object_yield (pl);
return pl;
}
playlist_item_t *p_item, *p_node;
vlc_value_t val;
+ if( !vlc_object_alive( p_playlist ) )
+ return VLC_EGENERIC;
+
if( playlist_IsEmpty( p_playlist ) )
return VLC_EGENERIC;
return VLC_EBADVAR;
break;
}
- vlc_cond_signal( &p_playlist->object_wait );
+ 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_cond_signal( &p_playlist->p_preparse->object_wait );
- 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;
}
int i;
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;
+ }
+
for( i = 0; i < p_playlist->p_fetcher->i_waiting ; i++ );
vlc_gc_incref( p_item );
INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
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->status.p_node = p_playlist->request.p_node;
p_playlist->b_reset_currently_playing = true;
}
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;
int i_activity = var_GetInteger( p_playlist, "activity" ) ;
msg_Dbg( p_playlist, "creating new input thread" );
var_SetInteger( p_playlist, "activity", i_activity +
DEFAULT_INPUT_ACTIVITY );
- p_playlist->p_input = input_CreateThread( p_playlist, p_input );
+
+ 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 ) ||