VariablesInit( p_playlist );
/* Initialise data structures */
- vlc_mutex_init( &p_playlist->gc_lock );
p_playlist->i_last_playlist_id = 0;
p_playlist->p_input = NULL;
ARRAY_INIT( p_playlist->items );
ARRAY_INIT( p_playlist->all_items );
+ ARRAY_INIT( p_playlist->items_to_delete );
ARRAY_INIT( p_playlist->current );
p_playlist->i_current_index = 0;
return NULL;
/* Create playlist and media library */
+ PL_LOCK; /* playlist_NodesPairCreate will check for it */
playlist_NodesPairCreate( p_playlist, _( "Playlist" ),
&p_playlist->p_local_category,
&p_playlist->p_local_onelevel, false );
+ PL_UNLOCK;
p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
if( config_GetInt( p_playlist, "media-library") )
{
+ PL_LOCK; /* playlist_NodesPairCreate will check for it */
playlist_NodesPairCreate( p_playlist, _( "Media Library" ),
&p_playlist->p_ml_category,
&p_playlist->p_ml_onelevel, false );
+ PL_UNLOCK;
if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)
return NULL;
playlist_t * p_playlist = (playlist_t *)p_this;
if( p_playlist->p_preparse )
+ {
vlc_object_release( p_playlist->p_preparse );
+ }
if( p_playlist->p_fetcher )
+ {
vlc_object_release( p_playlist->p_fetcher );
-#ifndef NDEBUG
- libvlc_priv (p_this->p_libvlc)->p_playlist = NULL; /* pl_Yield() will fail */
-#endif
+ }
+ msg_Dbg( p_this, "Destroyed" );
}
/* Destroy remaining objects */
return;
}
- vlc_mutex_lock( &p_playlist->gc_lock );
- /* Remove video outputs when user presses stop: */
- vlc_list_t *list = vlc_list_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
- FIND_CHILD );
- if( list != NULL )
- {
- msg_Dbg( p_playlist, "removing %u vout(s)", list->i_count );
- for( int i = 0; i < list->i_count; i++)
- vlc_object_release( list->p_values[i].p_object );
- vlc_list_release( list );
- }
p_playlist->b_cant_sleep = false;
- vlc_mutex_unlock( &p_playlist->gc_lock );
}
/* Input Callback */
/* Internals */
void playlist_release_current_input( playlist_t * p_playlist )
{
- vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
+ PL_ASSERT_LOCKED;
if( !p_playlist->p_input ) return;
void playlist_set_current_input(
playlist_t * p_playlist, input_thread_t * p_input )
{
- vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
+ PL_ASSERT_LOCKED;
playlist_release_current_input( p_playlist );
}
}
+/** Get current playing input.
+ */
+input_thread_t * playlist_CurrentInput( playlist_t * p_playlist )
+{
+ input_thread_t * p_input;
+ PL_LOCK;
+ p_input = p_playlist->p_input;
+ if( p_input ) vlc_object_yield( p_input );
+ PL_UNLOCK;
+ return p_input;
+}
/**
* @}
*/
+/** Accessor for status item and status nodes.
+ */
+playlist_item_t * get_current_status_item( playlist_t * p_playlist )
+{
+ PL_ASSERT_LOCKED;
+
+ return p_playlist->status.p_item;
+}
+
+playlist_item_t * get_current_status_node( playlist_t * p_playlist )
+{
+ PL_ASSERT_LOCKED;
+
+ return p_playlist->status.p_node;
+}
+
+void set_current_status_item( playlist_t * p_playlist,
+ playlist_item_t * p_item )
+{
+ PL_ASSERT_LOCKED;
+
+ if( p_playlist->status.p_item &&
+ p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG &&
+ p_playlist->status.p_item != p_item )
+ {
+ /* It's unsafe given current design to delete a playlist item :(
+ playlist_ItemDelete( p_playlist->status.p_item ); */
+ }
+ p_playlist->status.p_item = p_item;
+}
+
+void set_current_status_node( playlist_t * p_playlist,
+ playlist_item_t * p_node )
+{
+ PL_ASSERT_LOCKED;
+
+ if( p_playlist->status.p_node &&
+ p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG &&
+ p_playlist->status.p_node != p_node )
+ {
+ /* It's unsafe given current design to delete a playlist item :(
+ playlist_ItemDelete( p_playlist->status.p_node ); */
+ }
+ p_playlist->status.p_node = p_node;
+}
+
/**
* Main loop
*
- * Main loop for the playlist
+ * Main loop for the playlist. It should be entered with the
+ * playlist lock (otherwise input event may be lost)
* \param p_playlist the playlist object
* \return nothing
*/
{
playlist_item_t *p_item = NULL;
bool b_playexit = var_GetBool( p_playlist, "play-and-exit" );
- PL_LOCK;
+
+ PL_ASSERT_LOCKED;
if( p_playlist->b_reset_currently_playing &&
mdate() - p_playlist->last_rebuild_date > 30000 ) // 30 ms
{
ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ),
- p_playlist->status.p_item );
+ get_current_status_item( p_playlist ) );
p_playlist->last_rebuild_date = mdate();
}
p_playlist->gc_date = mdate();
p_playlist->b_cant_sleep = true;
- if( p_playlist->status.p_item->i_flags
- & PLAYLIST_REMOVE_FLAG )
- {
- PL_DEBUG( "%s was marked for deletion, deleting",
- PLI_NAME( p_playlist->status.p_item ) );
- playlist_ItemDelete( p_playlist->status.p_item );
- if( p_playlist->request.p_item == p_playlist->status.p_item )
- p_playlist->request.p_item = NULL;
- p_playlist->status.p_item = NULL;
- }
-
i_activity= var_GetInteger( p_playlist, "activity" );
var_SetInteger( p_playlist, "activity", i_activity -
DEFAULT_INPUT_ACTIVITY );
}
else if( p_playlist->p_input->i_state != INIT_S )
{
- PL_UNLOCK;
ObjectGarbageCollector( p_playlist, false );
- PL_LOCK;
}
}
else
{
msg_Dbg( p_playlist, "nothing to play" );
p_playlist->status.i_status = PLAYLIST_STOPPED;
- PL_UNLOCK;
if( b_playexit == true )
{
}
ObjectGarbageCollector( p_playlist, true );
return;
- }
- playlist_PlayItem( p_playlist, p_item );
- }
- else
- {
+ }
+ playlist_PlayItem( p_playlist, p_item );
+ /* playlist_PlayItem loose input event, we need to recheck */
+ goto check_input;
+ }
+ else
+ {
const bool b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED;
p_playlist->status.i_status = PLAYLIST_STOPPED;
- if( p_playlist->status.p_item &&
- p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG )
- {
- PL_DEBUG( "deleting item marked for deletion" );
- playlist_ItemDelete( p_playlist->status.p_item );
- p_playlist->status.p_item = NULL;
- }
/* Collect garbage */
- PL_UNLOCK;
ObjectGarbageCollector( p_playlist, b_gc_forced );
- PL_LOCK;
}
}
- PL_UNLOCK;
}
/**
playlist_ServicesDiscoveryKillAll( p_playlist );
playlist_MLDump( p_playlist );
+ vlc_object_kill( p_playlist->p_preparse );
+ vlc_thread_join( p_playlist->p_preparse );
+ vlc_object_kill( p_playlist->p_fetcher );
+ vlc_thread_join( p_playlist->p_fetcher );
+
PL_LOCK;
+
+ /* Release the current node */
+ set_current_status_node( p_playlist, NULL );
+
+ /* Release the current item */
+ set_current_status_item( p_playlist, NULL );
+
FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
free( p_del->pp_children );
vlc_gc_decref( p_del->p_input );
free( p_del );
FOREACH_END();
ARRAY_RESET( p_playlist->all_items );
+ FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->items_to_delete )
+ free( p_del->pp_children );
+ vlc_gc_decref( p_del->p_input );
+ free( p_del );
+ FOREACH_END();
+ ARRAY_RESET( p_playlist->items_to_delete );
ARRAY_RESET( p_playlist->items );
ARRAY_RESET( p_playlist->current );
{
PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
vlc_object_lock( p_playlist->p_fetcher );
- INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
- p_playlist->p_fetcher->i_waiting,
- p_playlist->p_fetcher->i_waiting, p_current);
- vlc_object_signal_unlocked( p_playlist->p_fetcher );
+ if( vlc_object_alive( p_playlist->p_fetcher ) )
+ {
+ INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
+ p_playlist->p_fetcher->i_waiting,
+ p_playlist->p_fetcher->i_waiting, p_current);
+ vlc_object_signal_unlocked( p_playlist->p_fetcher );
+ }
+ else
+ vlc_gc_decref( p_current );
vlc_object_unlock( p_playlist->p_fetcher );
}
else
msleep( (i_activity+1) * 1000 );
vlc_object_lock( p_obj );
}
+
+ while( p_obj->i_waiting > 0 )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[0] );
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ }
+
vlc_object_unlock( p_obj );
}
msleep( (i_activity+1) * 1000 );
vlc_object_lock( p_obj );
}
+
+ while( p_obj->i_waiting > 0 )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[0] );
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ }
+
vlc_object_unlock( p_obj );
}
projects / vlc / blobdiff