/*****************************************************************************
* engine.c : Run the playlist and handle its control
*****************************************************************************
- * Copyright (C) 1999-2007 the VideoLAN team
- * $Id$
+ * Copyright (C) 1999-2008 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
/* Allocate structure */
p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ),
- VLC_OBJECT_PLAYLIST, playlist_name );
+ VLC_OBJECT_GENERIC, playlist_name );
if( !p_playlist )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
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 */
static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force )
{
- vlc_object_t *p_obj;
-
if( !b_force )
{
if( mdate() - p_playlist->gc_date < 1000000 )
playlist_Signal( p_playlist );
}
+/* Input Callback */
+static void input_selected_stream_changed( const vlc_event_t * event, void * data )
+{
+ (void)event;
+ playlist_t * p_playlist = data;
+ PL_LOCK;
+ p_playlist->gc_date = mdate();
+ vlc_object_signal_unlocked( p_playlist );
+ PL_UNLOCK;
+}
+
/* Internals */
void playlist_release_current_input( playlist_t * p_playlist )
{
- vlc_assert_locked( &p_playlist->object_lock );
+ vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
if( !p_playlist->p_input ) return;
vlc_event_detach( p_em, vlc_InputStateChanged,
input_state_changed, p_playlist );
+ vlc_event_detach( p_em, vlc_InputSelectedStreamChanged,
+ input_selected_stream_changed, p_playlist );
p_playlist->p_input = NULL;
/* Release the playlist lock, because we may get stuck
void playlist_set_current_input(
playlist_t * p_playlist, input_thread_t * p_input )
{
- vlc_assert_locked( &p_playlist->object_lock );
+ vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
playlist_release_current_input( p_playlist );
vlc_event_manager_t * p_em = input_get_event_manager( p_input );
vlc_event_attach( p_em, vlc_InputStateChanged,
input_state_changed, p_playlist );
+ vlc_event_attach( p_em, vlc_InputSelectedStreamChanged,
+ input_selected_stream_changed, 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;
+}
+
/**
* @}
*/
void playlist_LastLoop( playlist_t *p_playlist )
{
- vlc_object_t *p_obj;
-
/* If there is an input, kill it */
while( 1 )
{
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 */
- assert( p_playlist->i_sds == 0 );
+ /* 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 );
}
input_item_t *p_item;
int i_activity;
- vlc_mutex_lock( &p_obj->object_lock );
+ vlc_object_lock( p_obj );
while( vlc_object_alive( p_obj ) )
{
p_item = p_obj->pp_waiting[0];
REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
- vlc_mutex_unlock( &p_obj->object_lock );
+ vlc_object_unlock( p_obj );
if( p_item )
{
int i_ret;
vlc_object_unlock( p_obj );
/* Sleep at least 1ms */
msleep( (i_activity+1) * 1000 );
- vlc_mutex_lock( &p_obj->object_lock );
+ vlc_object_lock( p_obj );
}
- vlc_mutex_unlock( &p_obj->object_lock );
+
+ 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 );
}
static void VariablesInit( playlist_t *p_playlist )
val.i_int = -1;
var_Set( p_playlist, "playlist-current", val );
- var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL );
-
var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "activity", 0 );