X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=603fdc3dd7160db1fbe8a255ee65932b64f071f8;hb=58159c007842b807e5f01d53f3ce728283c3be5f;hp=9c0475c2461104db7b2ae1cfa88c3bfb2d078822;hpb=3527f69d9fbbbd8327c80354c4ad3122df521ee8;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 9c0475c246..603fdc3dd7 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -1,8 +1,7 @@ /***************************************************************************** * 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 * Clément Stenac @@ -26,8 +25,8 @@ # include "config.h" #endif +#include #include -#include #include #include #include @@ -39,6 +38,7 @@ *****************************************************************************/ static void VariablesInit( playlist_t *p_playlist ); static void playlist_Destructor( vlc_object_t * p_this ); +static void playlist_Destructor( vlc_object_t * p_this ); static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *a ) @@ -65,12 +65,9 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) /* 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 ); @@ -176,13 +173,13 @@ static void playlist_Destructor( vlc_object_t * p_this ) if( p_playlist->p_fetcher ) vlc_object_release( p_playlist->p_fetcher ); + + 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 ) @@ -195,38 +192,88 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) } vlc_mutex_lock( &p_playlist->gc_lock ); - while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT, - FIND_CHILD ) ) ) - { - if( p_obj->p_parent != VLC_OBJECT(p_playlist->p_libvlc) ) - { - vlc_object_release( p_obj ); - break; - } - msg_Dbg( p_playlist, "garbage collector destroying 1 vout" ); - vlc_object_detach( p_obj ); - vlc_object_release( p_obj ); - vlc_object_release( (vout_thread_t *)p_obj ); - } -#ifdef ENABLE_SOUT - while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, - FIND_CHILD ) ) ) - { - if( p_obj->p_parent != VLC_OBJECT(p_playlist) ) - { - vlc_object_release( p_obj ); - break; - } - msg_Dbg( p_playlist, "garbage collector destroying 1 sout" ); - vlc_object_detach( p_obj ); - vlc_object_release( p_obj ); - sout_DeleteInstance( (sout_instance_t*)p_obj ); - } -#endif p_playlist->b_cant_sleep = false; vlc_mutex_unlock( &p_playlist->gc_lock ); } +/* Input Callback */ +static void input_state_changed( const vlc_event_t * event, void * data ) +{ + (void)event; + playlist_t * p_playlist = data; + 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( &(vlc_internals(p_playlist)->lock) ); + + if( !p_playlist->p_input ) return; + + input_thread_t * p_input = p_playlist->p_input; + vlc_event_manager_t * p_em = input_get_event_manager( p_input ); + + 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 + * in vlc_object_release() for some time. */ + PL_UNLOCK; + vlc_object_release( p_input ); + PL_LOCK; +} + +void playlist_set_current_input( + playlist_t * p_playlist, input_thread_t * p_input ) +{ + vlc_assert_locked( &(vlc_internals(p_playlist)->lock) ); + + playlist_release_current_input( p_playlist ); + + if( p_input ) + { + vlc_object_yield( p_input ); + p_playlist->p_input = p_input; + 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; +} + + +/** + * @} + */ + /** * Main loop * @@ -263,19 +310,19 @@ check_input: { int i_activity; input_thread_t *p_input; + sout_instance_t **pp_sout = + &libvlc_priv(p_playlist->p_libvlc)->p_sout; + PL_DEBUG( "dead input" ); p_input = p_playlist->p_input; - p_playlist->p_input = NULL; - /* Release the playlist lock, because we may get stuck - * in vlc_object_release() for some time. */ - PL_UNLOCK; + assert( *pp_sout == NULL ); + if( var_CreateGetBool( p_input, "sout-keep" ) ) + *pp_sout = input_DetachSout( p_input ); /* Destroy input */ - vlc_object_release( p_input ); - - PL_LOCK; + playlist_release_current_input( p_playlist ); p_playlist->gc_date = mdate(); p_playlist->b_cant_sleep = true; @@ -294,6 +341,7 @@ check_input: i_activity= var_GetInteger( p_playlist, "activity" ); var_SetInteger( p_playlist, "activity", i_activity - DEFAULT_INPUT_ACTIVITY ); + goto check_input; } /* This input is dying, let it do */ @@ -383,8 +431,6 @@ check_input: */ void playlist_LastLoop( playlist_t *p_playlist ) { - vlc_object_t *p_obj; - /* If there is an input, kill it */ while( 1 ) { @@ -397,15 +443,13 @@ void playlist_LastLoop( playlist_t *p_playlist ) if( p_playlist->p_input->b_dead ) { - input_thread_t *p_input; + /* remove input */ + playlist_release_current_input( p_playlist ); - /* Unlink current input */ - p_input = p_playlist->p_input; - p_playlist->p_input = NULL; - PL_UNLOCK; + /* sout-keep: no need to anything here. + * The last input will destroy its sout, if any, by itself */ - /* Destroy input */ - vlc_object_release( p_input ); + PL_UNLOCK; continue; } else if( p_playlist->p_input->b_die ) @@ -429,31 +473,32 @@ void playlist_LastLoop( playlist_t *p_playlist ) } #ifdef ENABLE_SOUT - /* close all remaining sout */ - while( ( p_obj = vlc_object_find( p_playlist, - VLC_OBJECT_SOUT, FIND_CHILD ) ) ) - { - vlc_object_detach( p_obj ); - vlc_object_release( p_obj ); - sout_DeleteInstance( (sout_instance_t*)p_obj ); - } + /* close the remaining sout-keep (if there was no input atm) */ + sout_instance_t *p_sout = libvlc_priv (p_playlist->p_libvlc)->p_sout; + if (p_sout) + sout_DeleteInstance( p_sout ); #endif - /* close all remaining vout */ - while( ( p_obj = vlc_object_find( p_playlist, - VLC_OBJECT_VOUT, FIND_CHILD ) ) ) + if( p_playlist->status.p_node && + p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG ) { - vlc_object_detach( p_obj ); - vlc_object_release( p_obj ); - vlc_object_release( (vout_thread_t *)p_obj ); + 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; } - - while( p_playlist->i_sds ) + if( p_playlist->status.p_item && + p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG ) { - playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->pp_sds[0]->p_sd->psz_module ); + 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 ); PL_LOCK; @@ -556,6 +601,13 @@ void playlist_PreparseLoop( playlist_preparse_t *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 ); } @@ -572,7 +624,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *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 ) ) { @@ -584,7 +636,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *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; @@ -635,9 +687,16 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) 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 ); + } + + 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_mutex_unlock( &p_obj->object_lock ); + + vlc_object_unlock( p_obj ); } static void VariablesInit( playlist_t *p_playlist ) @@ -662,8 +721,6 @@ 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 );