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 );
+ }
+ msg_Dbg( p_this, "Destroyed" );
}
/* Destroy remaining objects */
sout_DeleteInstance( p_sout );
#endif
+ 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 );
+ p_playlist->status.p_node = NULL;
+ }
+ if( p_playlist->status.p_item &&
+ 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 );
+ p_playlist->status.p_item = NULL;
+ }
+
/* Core should have terminated all SDs before the playlist */
/* TODO: It fails to do so when not playing anything -- Courmisch */
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;
FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
free( p_del->pp_children );
msleep( (i_activity+1) * 1000 );
vlc_object_lock( p_obj );
}
+
+ for( int i = 0; i < p_obj->i_waiting; i++ )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[i] );
+ 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 );
}
+
+ for( int i = 0; i < p_obj->i_waiting; i++ )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[i] );
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ }
+
vlc_object_unlock( p_obj );
}