X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=ce92f756cf53940b27ad1f25d8bc3847975e9329;hb=6903d514d3ea8113f91b1bedde862607f7efc92a;hp=3ee5cb74becd94d81d5bfb5ab21a69dc01a83401;hpb=bff9720dbec39d193e25cea5defee42da464ca92;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 3ee5cb74be..ce92f756cf 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 @@ -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 ); @@ -79,7 +76,6 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; @@ -88,6 +84,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; @@ -110,9 +107,11 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; @@ -124,9 +123,11 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; @@ -172,20 +173,20 @@ static void playlist_Destructor( vlc_object_t * p_this ) 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 ) @@ -197,15 +198,137 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) return; } - vlc_mutex_lock( &p_playlist->gc_lock ); 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 ) +{ + PL_ASSERT_LOCKED; + + 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 ) +{ + PL_ASSERT_LOCKED; + + 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; +} + +/** + * @} + */ + +/** 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 */ @@ -213,13 +336,14 @@ void playlist_MainLoop( playlist_t *p_playlist ) { 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(); } @@ -244,37 +368,21 @@ check_input: PL_DEBUG( "dead input" ); p_input = p_playlist->p_input; - p_playlist->p_input = NULL; + assert( *pp_sout == NULL ); if( var_CreateGetBool( p_input, "sout-keep" ) ) *pp_sout = input_DetachSout( p_input ); - /* Release the playlist lock, because we may get stuck - * in vlc_object_release() for some time. */ - PL_UNLOCK; - /* 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; - 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 ); + goto check_input; } /* This input is dying, let it do */ @@ -297,9 +405,7 @@ check_input: } else if( p_playlist->p_input->i_state != INIT_S ) { - PL_UNLOCK; ObjectGarbageCollector( p_playlist, false ); - PL_LOCK; } } else @@ -321,7 +427,6 @@ check_input: { msg_Dbg( p_playlist, "nothing to play" ); p_playlist->status.i_status = PLAYLIST_STOPPED; - PL_UNLOCK; if( b_playexit == true ) { @@ -330,29 +435,21 @@ check_input: } 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; } /** @@ -364,8 +461,6 @@ check_input: */ void playlist_LastLoop( playlist_t *p_playlist ) { - vlc_object_t *p_obj; - /* If there is an input, kill it */ while( 1 ) { @@ -378,18 +473,13 @@ void playlist_LastLoop( playlist_t *p_playlist ) if( p_playlist->p_input->b_dead ) { - input_thread_t *p_input; - - /* Unlink current input */ - p_input = p_playlist->p_input; - p_playlist->p_input = NULL; - PL_UNLOCK; + /* remove input */ + playlist_release_current_input( p_playlist ); /* 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 ) @@ -419,21 +509,36 @@ void playlist_LastLoop( playlist_t *p_playlist ) sout_DeleteInstance( p_sout ); #endif - while( p_playlist->i_sds ) - { - playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->pp_sds[0]->p_sd->psz_module ); - } - + /* 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; + + /* 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 ); @@ -500,10 +605,15 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) { 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 @@ -527,6 +637,13 @@ void playlist_PreparseLoop( playlist_preparse_t *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 ); } @@ -543,7 +660,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 ) ) { @@ -555,7 +672,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; @@ -606,9 +723,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 ); } - vlc_mutex_unlock( &p_obj->object_lock ); + + 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 ); } static void VariablesInit( playlist_t *p_playlist ) @@ -633,8 +757,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 );