X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=7e0493528422642d15edb5f4f8ccc0e461260fa6;hb=e3f0531d93abd49f902a324241e31200de05b45d;hp=809f4581d79573bd42a3cd95e78c68bd05c6b08a;hpb=fde8b7fc53e178f59adc59e88df6eb623fa9797d;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 809f4581d7..7e04935284 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 @@ -22,8 +21,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include #include #include #include @@ -34,13 +38,14 @@ * Local prototypes *****************************************************************************/ static void VariablesInit( playlist_t *p_playlist ); +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 ) { (void)psz_cmd; (void)oldval; (void)newval; (void)a; - ((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE; + ((playlist_t*)p_this)->b_reset_currently_playing = true; playlist_Signal( ((playlist_t*)p_this) ); return VLC_SUCCESS; } @@ -54,63 +59,64 @@ static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd, */ playlist_t * playlist_Create( vlc_object_t *p_parent ) { + static const char playlist_name[] = "playlist"; playlist_t *p_playlist; - vlc_bool_t b_save; - int i_tree; + playlist_private_t *p; + bool b_save; /* Allocate structure */ - p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST ); - if( !p_playlist ) - { - msg_Err( p_parent, "out of memory" ); + p = vlc_custom_create( p_parent, sizeof( *p ), + VLC_OBJECT_GENERIC, playlist_name ); + if( !p ) return NULL; - } + assert( offsetof( playlist_private_t, public_data ) == 0 ); + p_playlist = &p->public_data; TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds ); - p_parent->p_libvlc->p_playlist = p_playlist; + libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist; VariablesInit( p_playlist ); /* Initialise data structures */ - vlc_mutex_init( p_playlist, &p_playlist->gc_lock ); p_playlist->i_last_playlist_id = 0; - p_playlist->i_last_input_id = 0; p_playlist->p_input = NULL; p_playlist->gc_date = 0; - p_playlist->b_cant_sleep = VLC_FALSE; + p_playlist->b_cant_sleep = false; ARRAY_INIT( p_playlist->items ); ARRAY_INIT( p_playlist->all_items ); - ARRAY_INIT( p_playlist->input_items ); + ARRAY_INIT( p_playlist->items_to_delete ); ARRAY_INIT( p_playlist->current ); p_playlist->i_current_index = 0; - p_playlist->b_reset_currently_playing = VLC_TRUE; + p_playlist->b_reset_currently_playing = true; p_playlist->last_rebuild_date = 0; - i_tree = var_CreateGetBool( p_playlist, "playlist-tree" ); - p_playlist->b_always_tree = (i_tree == 1); - p_playlist->b_never_tree = (i_tree == 2); + p_playlist->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" ); - p_playlist->b_doing_ml = VLC_FALSE; + p_playlist->b_doing_ml = false; p_playlist->b_auto_preparse = - var_CreateGetBool( p_playlist, "auto-preparse") ; + var_CreateGetBool( p_playlist, "auto-preparse" ) ; + PL_LOCK; /* playlist_NodeCreate will check for it */ p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL, 0, NULL ); p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL, 0, p_playlist->p_root_category->p_input ); + PL_UNLOCK; if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel ) 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, VLC_FALSE ); + &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; @@ -122,9 +128,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, VLC_FALSE ); + &p_playlist->p_ml_onelevel, false ); + PL_UNLOCK; if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel) return NULL; @@ -140,97 +148,219 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) /* Initial status */ p_playlist->status.p_item = NULL; p_playlist->status.p_node = p_playlist->p_local_onelevel; - p_playlist->request.b_request = VLC_FALSE; + p_playlist->request.b_request = false; p_playlist->status.i_status = PLAYLIST_STOPPED; p_playlist->i_sort = SORT_ID; p_playlist->i_order = ORDER_NORMAL; + b_save = p_playlist->b_auto_preparse; - p_playlist->b_auto_preparse = VLC_FALSE; + p_playlist->b_auto_preparse = false; playlist_MLLoad( p_playlist ); - p_playlist->b_auto_preparse = VLC_TRUE; + p_playlist->b_auto_preparse = true; + + vlc_object_set_destructor( p_playlist, playlist_Destructor ); + return p_playlist; } -void playlist_Destroy( playlist_t *p_playlist ) +/** + * Destroy playlist + * + * Destroy a playlist structure. + * \param p_playlist the playlist object + * \return nothing + */ + +static void playlist_Destructor( vlc_object_t * p_this ) { - var_Destroy( p_playlist, "intf-change" ); - var_Destroy( p_playlist, "item-change" ); - var_Destroy( p_playlist, "playlist-current" ); - var_Destroy( p_playlist, "intf-popmenu" ); - var_Destroy( p_playlist, "intf-show" ); - var_Destroy( p_playlist, "play-and-stop" ); - var_Destroy( p_playlist, "play-and-exit" ); - var_Destroy( p_playlist, "random" ); - var_Destroy( p_playlist, "repeat" ); - var_Destroy( p_playlist, "loop" ); - var_Destroy( p_playlist, "activity" ); - - vlc_mutex_destroy( &p_playlist->gc_lock ); - vlc_object_detach( p_playlist ); - vlc_object_destroy( p_playlist ); + playlist_t * p_playlist = (playlist_t *)p_this; + playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse; + + /* Destroy the item preparser */ + if (p_preparse->up) + { + vlc_cancel (p_preparse->thread); + vlc_join (p_preparse->thread, NULL); + } + while (p_preparse->i_waiting > 0) + { /* Any left-over unparsed item? */ + vlc_gc_decref (p_preparse->pp_waiting[0]); + REMOVE_ELEM (p_preparse->pp_waiting, p_preparse->i_waiting, 0); + } + vlc_cond_destroy (&p_preparse->wait); + vlc_mutex_destroy (&p_preparse->lock); + + /* Destroy the item meta-infos fetcher */ + if( pl_priv(p_playlist)->p_fetcher ) + { + vlc_object_release( pl_priv(p_playlist)->p_fetcher ); + } + msg_Dbg( p_this, "Destroyed" ); } /* Destroy remaining objects */ -static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t b_force ) +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 ) { - p_playlist->b_cant_sleep = VLC_TRUE; + p_playlist->b_cant_sleep = true; return; } else if( p_playlist->gc_date == 0 ) return; } - vlc_mutex_lock( &p_playlist->gc_lock ); - while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_VOUT, - FIND_CHILD ) ) ) + p_playlist->b_cant_sleep = false; +} + +/* 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_thread_join( p_input ); + 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 ) { - if( p_obj->p_parent != VLC_OBJECT(p_playlist) ) - { - 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 ); - vout_Destroy( (vout_thread_t *)p_obj ); + 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 ); } - while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, - FIND_CHILD ) ) ) +} + +/** 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 ) { - 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 ); + /* 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->b_cant_sleep = VLC_FALSE; - vlc_mutex_unlock( &p_playlist->gc_lock ); + p_playlist->status.p_node = p_node; } -/** Main loop for the playlist */ +/** + * Main loop + * + * 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 + */ void playlist_MainLoop( playlist_t *p_playlist ) { playlist_item_t *p_item = NULL; - vlc_bool_t b_playexit = var_GetBool( p_playlist, "play-and-exit" ); - PL_LOCK; + bool b_playexit = var_GetBool( p_playlist, "play-and-exit" ); + + 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 ); + ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ), + get_current_status_item( p_playlist ) ); p_playlist->last_rebuild_date = mdate(); } @@ -249,37 +379,26 @@ check_input: { int i_activity; input_thread_t *p_input; + sout_instance_t **pp_sout = &pl_priv(p_playlist)->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 input_DestroyThread() for some time. */ - PL_UNLOCK; + assert( *pp_sout == NULL ); + if( var_CreateGetBool( p_input, "sout-keep" ) ) + *pp_sout = input_DetachSout( p_input ); /* Destroy input */ - input_DestroyThread( p_input ); - - PL_LOCK; + playlist_release_current_input( p_playlist ); p_playlist->gc_date = mdate(); - p_playlist->b_cant_sleep = VLC_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; - } + p_playlist->b_cant_sleep = true; - i_activity= var_GetInteger( p_playlist, "activity") ; + 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 */ @@ -302,9 +421,7 @@ check_input: } else if( p_playlist->p_input->i_state != INIT_S ) { - PL_UNLOCK; - ObjectGarbageCollector( p_playlist, VLC_FALSE ); - PL_LOCK; + ObjectGarbageCollector( p_playlist, false ); } } else @@ -314,58 +431,52 @@ check_input: * - No request, stopped status -> collect garbage * - Request, running requested -> start new item * - Request, stopped requested -> collect garbage - */ - if( (!p_playlist->request.b_request && - p_playlist->status.i_status != PLAYLIST_STOPPED) || - ( p_playlist->request.b_request && - p_playlist->request.i_status != PLAYLIST_STOPPED ) ) - { - msg_Dbg( p_playlist, "starting new item" ); - p_item = playlist_NextItem( p_playlist ); - - if( p_item == NULL ) - { + */ + int i_status = p_playlist->request.b_request ? + p_playlist->request.i_status : p_playlist->status.i_status; + if( i_status != PLAYLIST_STOPPED ) + { + msg_Dbg( p_playlist, "starting new item" ); + p_item = playlist_NextItem( p_playlist ); + + if( p_item == NULL ) + { msg_Dbg( p_playlist, "nothing to play" ); p_playlist->status.i_status = PLAYLIST_STOPPED; - PL_UNLOCK; - if( b_playexit == VLC_TRUE ) + if( b_playexit == true ) { msg_Info( p_playlist, "end of playlist, exiting" ); vlc_object_kill( p_playlist->p_libvlc ); } - ObjectGarbageCollector( p_playlist, VLC_TRUE ); + ObjectGarbageCollector( p_playlist, true ); return; - } - playlist_PlayItem( p_playlist, p_item ); - } - else - { - const vlc_bool_t b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED; + } + 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 dying last loop */ +/** + * Last loop + * + * The playlist is dying so do the last loop + * \param p_playlist the playlist object + * \return nothing +*/ void playlist_LastLoop( playlist_t *p_playlist ) { - vlc_object_t *p_obj; - /* If there is an input, kill it */ while( 1 ) { @@ -378,15 +489,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 */ - input_DestroyThread( p_input ); + PL_UNLOCK; continue; } else if( p_playlist->p_input->b_die ) @@ -409,47 +518,41 @@ void playlist_LastLoop( playlist_t *p_playlist ) msleep( INTF_IDLE_SLEEP ); } - /* 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 all remaining vout */ - while( ( p_obj = vlc_object_find( p_playlist, - VLC_OBJECT_VOUT, FIND_CHILD ) ) ) - { - vlc_object_detach( p_obj ); - vlc_object_release( p_obj ); - vout_Destroy( (vout_thread_t *)p_obj ); - } - - while( p_playlist->i_sds ) - { - playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->pp_sds[0]->p_sd->psz_module ); - } +#ifdef ENABLE_SOUT + /* close the remaining sout-keep (if there was no input atm) */ + sout_instance_t *p_sout = pl_priv(p_playlist)->p_sout; + if (p_sout) + sout_DeleteInstance( p_sout ); +#endif + /* 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( pl_priv(p_playlist)->p_fetcher ); + vlc_thread_join( pl_priv(p_playlist)->p_fetcher ); + PL_LOCK; - /* Go through all items, and simply free everything without caring - * about the tree structure. Do not decref, it will be done by doing - * the same thing on the input items array */ + + /* 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( input_item_t *p_del, p_playlist->input_items ) - input_ItemClean( p_del ); + 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->input_items ); + ARRAY_RESET( p_playlist->items_to_delete ); ARRAY_RESET( p_playlist->items ); ARRAY_RESET( p_playlist->current ); @@ -457,35 +560,38 @@ void playlist_LastLoop( playlist_t *p_playlist ) PL_UNLOCK; } -/** Main loop for preparser queue */ -void playlist_PreparseLoop( playlist_preparse_t *p_obj ) +/** + * Preparse queue loop + * + * @param p_obj preparse structure + * @return never + */ +void *playlist_PreparseLoop( void *data ) { - playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; - input_item_t *p_current; + playlist_preparse_t *p_preparse = data; + playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_preparse) + - offsetof(playlist_private_t, preparse)))->public_data; int i_activity; - uint32_t i_m, i_o; - while( !p_playlist->b_die ) + for( ;; ) { - vlc_mutex_lock( &p_obj->object_lock ); - while( p_obj->i_waiting == 0 ) - { - vlc_cond_wait( &p_obj->object_wait, &p_obj->object_lock ); - if( p_playlist->b_die ) - { - vlc_mutex_unlock( &p_obj->object_lock ); - return; - } - } + input_item_t *p_current; - p_current = p_obj->pp_waiting[0]; - REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 ); - vlc_mutex_unlock( &p_obj->object_lock ); + vlc_mutex_lock( &p_preparse->lock ); + mutex_cleanup_push( &p_preparse->lock ); + + while( p_preparse->i_waiting == 0 ) + vlc_cond_wait( &p_preparse->wait, &p_preparse->lock ); + + p_current = p_preparse->pp_waiting[0]; + REMOVE_ELEM( p_preparse->pp_waiting, p_preparse->i_waiting, 0 ); + vlc_cleanup_run( ); - PL_LOCK; if( p_current ) { - if( !strncmp( p_current->psz_uri, "file:", 5 ) ) + int canc = vlc_savecancel (); + PL_LOCK; + if( p_current->i_type == ITEM_TYPE_FILE ) { stats_TimerStart( p_playlist, "Preparse run", STATS_TIMER_PREPARSE ); @@ -498,7 +604,7 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) } stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE ); PL_UNLOCK; - input_item_SetPreparsed( p_current, VLC_TRUE ); + input_item_SetPreparsed( p_current, true ); var_SetInteger( p_playlist, "item-change", p_current->i_id ); PL_LOCK; } @@ -509,33 +615,21 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) */ char *psz_arturl = input_item_GetArtURL( p_current ); char *psz_name = input_item_GetName( p_current ); - if( !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) ) - { - preparse_item_t p; - PL_DEBUG("need to fetch meta for %s", p_current->psz_name ); - p.p_item = p_current; - p.b_fetch_art = VLC_FALSE; - vlc_mutex_lock( &p_playlist->p_fetcher->object_lock ); - INSERT_ELEM( p_playlist->p_fetcher->p_waiting, - p_playlist->p_fetcher->i_waiting, - p_playlist->p_fetcher->i_waiting, p); - vlc_cond_signal( &p_playlist->p_fetcher->object_wait ); - vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock ); - } - /* We already have all needed meta, but we need art right now */ - else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL && - ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) ) + playlist_fetcher_t *p_fetcher = pl_priv(p_playlist)->p_fetcher; + if( p_fetcher->i_art_policy == ALBUM_ART_ALL && + ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) ) { - preparse_item_t p; PL_DEBUG("meta ok for %s, need to fetch art", psz_name ); - p.p_item = p_current; - p.b_fetch_art = VLC_TRUE; - vlc_mutex_lock( &p_playlist->p_fetcher->object_lock ); - INSERT_ELEM( p_playlist->p_fetcher->p_waiting, - p_playlist->p_fetcher->i_waiting, - p_playlist->p_fetcher->i_waiting, p); - vlc_cond_signal( &p_playlist->p_fetcher->object_wait ); - vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock ); + vlc_object_lock( p_fetcher ); + if( vlc_object_alive( p_fetcher ) ) + { + INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, + p_fetcher->i_waiting, p_current); + vlc_object_signal_unlocked( p_fetcher ); + } + else + vlc_gc_decref( p_current ); + vlc_object_unlock( p_fetcher ); } else { @@ -545,126 +639,106 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) } free( psz_name ); free( psz_arturl ); - PL_UNLOCK; + PL_UNLOCK; + vlc_restorecancel( canc ); } - else - PL_UNLOCK; - vlc_mutex_lock( &p_obj->object_lock ); i_activity = var_GetInteger( p_playlist, "activity" ); if( i_activity < 0 ) i_activity = 0; - vlc_mutex_unlock( &p_obj->object_lock ); /* Sleep at least 1ms */ msleep( (i_activity+1) * 1000 ); } + + assert( 0 ); + return NULL; } -/** Main loop for secondary preparser queue */ +/** + * Fetcher loop + * + * Main loop for secondary preparser queue + * \param p_obj items to preparse + * \return nothing + */ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) { playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; - vlc_bool_t b_fetch_art; input_item_t *p_item; int i_activity; - while( !p_playlist->b_die ) + vlc_object_lock( p_obj ); + + while( vlc_object_alive( p_obj ) ) { - vlc_mutex_lock( &p_obj->object_lock ); - while( p_obj->i_waiting == 0 ) + if( p_obj->i_waiting == 0 ) { - vlc_cond_wait( &p_obj->object_wait, &p_obj->object_lock ); - if( p_playlist->b_die ) - { - vlc_mutex_unlock( &p_obj->object_lock ); - return; - } + vlc_object_wait( p_obj ); + continue; } - b_fetch_art = p_obj->p_waiting->b_fetch_art; - p_item = p_obj->p_waiting->p_item; - REMOVE_ELEM( p_obj->p_waiting, p_obj->i_waiting, 0 ); - vlc_mutex_unlock( &p_obj->object_lock ); + p_item = p_obj->pp_waiting[0]; + REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 ); + vlc_object_unlock( p_obj ); if( p_item ) { - if( !b_fetch_art ) + int i_ret; + + /* Check if it is not yet preparsed and if so wait for it (at most 0.5s) + * (This can happen if we fetch art on play) + * FIXME this doesn't work if we need to fetch meta before art ... */ + for( i_ret = 0; i_ret < 10 && !input_item_IsPreparsed( p_item ); i_ret++ ) { - /* If the user doesn't want us to fetch meta automatically - * abort here. */ - if( p_playlist->p_fetcher->b_fetch_meta ) - { - input_MetaFetch( p_playlist, p_item ); - var_SetInteger( p_playlist, "item-change", p_item->i_id ); - } + bool b_break; + PL_LOCK; + b_break = ( !p_playlist->p_input || input_GetItem(p_playlist->p_input) != p_item || + p_playlist->p_input->b_die || p_playlist->p_input->b_eof || p_playlist->p_input->b_error ); + PL_UNLOCK; + if( b_break ) + break; + msleep( 50000 ); + } - /* Fetch right now */ - if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL ) - { - vlc_mutex_lock( &p_obj->object_lock ); - preparse_item_t p; - p.p_item = p_item; - p.b_fetch_art = VLC_TRUE; - INSERT_ELEM( p_playlist->p_fetcher->p_waiting, - p_playlist->p_fetcher->i_waiting, - 0, p ); - PL_DEBUG("meta fetched for %s, get art", p_item->psz_name); - vlc_mutex_unlock( &p_obj->object_lock ); - continue; + i_ret = input_ArtFind( p_playlist, p_item ); + if( i_ret == 1 ) + { + PL_DEBUG( "downloading art for %s", p_item->psz_name ); + if( input_DownloadAndCacheArt( p_playlist, p_item ) ) + input_item_SetArtNotFound( p_item, true ); + else { + input_item_SetArtFetched( p_item, true ); + var_SetInteger( p_playlist, "item-change", + p_item->i_id ); } - else - vlc_gc_decref( p_item ); + } + else if( i_ret == 0 ) /* Was in cache */ + { + PL_DEBUG( "found art for %s in cache", p_item->psz_name ); + input_item_SetArtFetched( p_item, true ); + var_SetInteger( p_playlist, "item-change", p_item->i_id ); } else { - int i_ret; - - /* Check if it is not yet preparsed and if so wait for it (at most 0.5s) - * (This can happen if we fetch art on play) - * FIXME this doesn't work if we need to fetch meta before art ... */ - for( i_ret = 0; i_ret < 10 && !input_item_IsPreparsed( p_item ); i_ret++ ) - { - vlc_bool_t b_break; - PL_LOCK; - b_break = ( !p_playlist->p_input || input_GetItem(p_playlist->p_input) != p_item || - p_playlist->p_input->b_die || p_playlist->p_input->b_eof || p_playlist->p_input->b_error ); - PL_UNLOCK; - if( b_break ) - break; - msleep( 50000 ); - } - - i_ret = input_ArtFind( p_playlist, p_item ); - if( i_ret == 1 ) - { - PL_DEBUG("downloading art for %s", p_item->psz_name ); - if( input_DownloadAndCacheArt( p_playlist, p_item ) ) - input_item_SetArtNotFound( p_item, VLC_TRUE ); - else { - input_item_SetArtFetched( p_item, VLC_TRUE ); - var_SetInteger( p_playlist, "item-change", - p_item->i_id ); - } - } - else if( i_ret == 0 ) /* Was in cache */ - { - PL_DEBUG("found art for %s in cache", p_item->psz_name ); - input_item_SetArtFetched( p_item, VLC_TRUE ); - var_SetInteger( p_playlist, "item-change", p_item->i_id ); - } - else - { - PL_DEBUG("art not found for %s", p_item->psz_name ); - input_item_SetArtNotFound( p_item, VLC_TRUE ); - } - vlc_gc_decref( p_item ); - } + PL_DEBUG( "art not found for %s", p_item->psz_name ); + input_item_SetArtNotFound( p_item, true ); + } + vlc_gc_decref( p_item ); } - vlc_mutex_lock( &p_obj->object_lock ); + vlc_object_lock( p_obj ); i_activity = var_GetInteger( p_playlist, "activity" ); if( i_activity < 0 ) i_activity = 0; - vlc_mutex_unlock( &p_obj->object_lock ); + vlc_object_unlock( p_obj ); /* Sleep at least 1ms */ 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 ); } static void VariablesInit( playlist_t *p_playlist ) @@ -672,7 +746,7 @@ static void VariablesInit( playlist_t *p_playlist ) vlc_value_t val; /* These variables control updates */ var_Create( p_playlist, "intf-change", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_playlist, "intf-change", val ); var_Create( p_playlist, "item-change", VLC_VAR_INTEGER ); @@ -689,12 +763,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, "intf-show", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; - var_Set( p_playlist, "intf-show", val ); - var_Create( p_playlist, "activity", VLC_VAR_INTEGER ); var_SetInteger( p_playlist, "activity", 0 );