X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=70e156012285562607cff4c516de46e278abef33;hb=722ab9f14ee31f8f0633cfc7a0b79401c47316fe;hp=3b9d8495afd596558ad1f6988397f2e76128c7dd;hpb=4466cc4ffaa424dd4b6c19e70d7a6e886253aa5f;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 3b9d8495af..70e1560122 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -1,7 +1,7 @@ /***************************************************************************** * engine.c : Run the playlist and handle its control ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2007 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -22,23 +22,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include -#include -#include "vlc_playlist.h" -#include "vlc_interaction.h" +#include +#include +#include +#include #include "playlist_internal.h" +#include "stream_output/stream_output.h" /* sout_DeleteInstance */ /***************************************************************************** * 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 ) { - ((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE; + (void)psz_cmd; (void)oldval; (void)newval; (void)a; + + ((playlist_t*)p_this)->b_reset_currently_playing = true; playlist_Signal( ((playlist_t*)p_this) ); return VLC_SUCCESS; } @@ -52,17 +59,21 @@ 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; + bool b_save; /* Allocate structure */ - p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST ); + p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ), + VLC_OBJECT_PLAYLIST, playlist_name ); if( !p_playlist ) { msg_Err( p_parent, "out of memory" ); return NULL; } + + TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds ); + p_parent->p_libvlc->p_playlist = p_playlist; VariablesInit( p_playlist ); @@ -70,41 +81,39 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) /* 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->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" ) ; - p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL); - p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL); + 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 ); if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel ) return NULL; /* Create playlist and media library */ - p_playlist->p_local_category = playlist_NodeCreate( p_playlist, - _( "Playlist" ),p_playlist->p_root_category ); - p_playlist->p_local_onelevel = playlist_NodeCreate( p_playlist, - _( "Playlist" ), p_playlist->p_root_onelevel ); + playlist_NodesPairCreate( p_playlist, _( "Playlist" ), + &p_playlist->p_local_category, + &p_playlist->p_local_onelevel, false ); + p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG; p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG; @@ -113,25 +122,17 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) !p_playlist->p_local_onelevel->p_input ) return NULL; - /* Link the nodes together. Todo: actually create them from the same input*/ - p_playlist->p_local_onelevel->p_input->i_id = - p_playlist->p_local_category->p_input->i_id; - if( config_GetInt( p_playlist, "media-library") ) { - p_playlist->p_ml_category = playlist_NodeCreate( p_playlist, - _( "Media Library" ), p_playlist->p_root_category ); - p_playlist->p_ml_onelevel = playlist_NodeCreate( p_playlist, - _( "Media Library" ), p_playlist->p_root_onelevel ); + playlist_NodesPairCreate( p_playlist, _( "Media Library" ), + &p_playlist->p_ml_category, + &p_playlist->p_ml_onelevel, false ); if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel) return NULL; p_playlist->p_ml_category->i_flags |= PLAYLIST_RO_FLAG; p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG; - p_playlist->p_ml_onelevel->p_input->i_id = - p_playlist->p_ml_category->p_input->i_id; - } else { @@ -141,41 +142,37 @@ 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; - vlc_object_attach( p_playlist, p_parent ); + 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; } +/** + * Destroy playlist + * + * Destroy a playlist structure. + * \param p_playlist the playlist object + * \return nothing + */ void playlist_Destroy( playlist_t *p_playlist ) { - while( p_playlist->i_sds ) - { - playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->pp_sds[0]->psz_module ); - } - - playlist_MLDump( p_playlist ); - - vlc_thread_join( p_playlist->p_preparse ); - vlc_thread_join( p_playlist->p_fetcher ); - vlc_thread_join( p_playlist ); - - vlc_object_detach( p_playlist->p_preparse ); - vlc_object_detach( p_playlist->p_fetcher ); - + /* XXX: should go in the playlist destructor */ 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-popupmenu" ); var_Destroy( p_playlist, "intf-show" ); var_Destroy( p_playlist, "play-and-stop" ); var_Destroy( p_playlist, "play-and-exit" ); @@ -184,56 +181,47 @@ void playlist_Destroy( playlist_t *p_playlist ) var_Destroy( p_playlist, "loop" ); var_Destroy( p_playlist, "activity" ); - 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 */ - FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items ) - free( p_del->pp_children ); - 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 ); - free( p_del ); - FOREACH_END(); - ARRAY_RESET( p_playlist->input_items ); - - ARRAY_RESET( p_playlist->items ); - ARRAY_RESET( p_playlist->current ); + vlc_object_release( p_playlist ); +} - PL_UNLOCK; +static void playlist_Destructor( vlc_object_t * p_this ) +{ + playlist_t * p_playlist = (playlist_t *)p_this; - vlc_mutex_destroy( &p_playlist->p_stats->lock ); - if( p_playlist->p_stats ) - free( p_playlist->p_stats ); + // Kill preparser + if( p_playlist->p_preparse ) + { + vlc_object_release( p_playlist->p_preparse ); + } - vlc_mutex_destroy( &p_playlist->gc_lock ); - vlc_object_destroy( p_playlist->p_preparse ); - vlc_object_destroy( p_playlist->p_fetcher ); - vlc_object_detach( p_playlist ); - vlc_object_destroy( p_playlist ); + // Kill meta fetcher + if( p_playlist->p_fetcher ) + { + vlc_object_release( p_playlist->p_fetcher ); + } } /* Destroy remaining objects */ -static void ObjectGarbageCollector( playlist_t *p_playlist ) +static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) { vlc_object_t *p_obj; - if( mdate() - p_playlist->gc_date < 1000000 ) + if( !b_force ) { - p_playlist->b_cant_sleep = VLC_TRUE; - return; + if( mdate() - p_playlist->gc_date < 1000000 ) + { + p_playlist->b_cant_sleep = true; + return; + } + else if( p_playlist->gc_date == 0 ) + 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, + while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD ) ) ) { - if( p_obj->p_parent != (vlc_object_t*)p_playlist ) + if( p_obj->p_parent != VLC_OBJECT(p_playlist->p_libvlc) ) { vlc_object_release( p_obj ); break; @@ -246,29 +234,37 @@ static void ObjectGarbageCollector( playlist_t *p_playlist ) while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD ) ) ) { - if( p_obj->p_parent != (vlc_object_t*)p_playlist ) + 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 ); } - p_playlist->b_cant_sleep = VLC_FALSE; + p_playlist->b_cant_sleep = false; vlc_mutex_unlock( &p_playlist->gc_lock ); } -/** Main loop for the playlist */ +/** + * Main loop + * + * Main loop for the playlist + * \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" ); + bool b_playexit = var_GetBool( p_playlist, "play-and-exit" ); PL_LOCK; if( p_playlist->b_reset_currently_playing && mdate() - p_playlist->last_rebuild_date > 30000 ) // 30 ms { - ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random"), + ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ), p_playlist->status.p_item ); p_playlist->last_rebuild_date = mdate(); } @@ -294,23 +290,16 @@ check_input: p_playlist->p_input = NULL; /* Release the playlist lock, because we may get stuck - * in input_DestroyThread() for some time. */ - PL_UNLOCK + * in vlc_object_release() for some time. */ + PL_UNLOCK; /* Destroy input */ - input_DestroyThread( p_input ); - - /* Unlink current input - * (_after_ input_DestroyThread for vout garbage collector) */ - vlc_object_detach( p_input ); - - /* Destroy object */ - vlc_object_destroy( p_input ); + vlc_object_release( p_input ); PL_LOCK; p_playlist->gc_date = mdate(); - p_playlist->b_cant_sleep = VLC_TRUE; + p_playlist->b_cant_sleep = true; if( p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG ) @@ -323,7 +312,7 @@ check_input: p_playlist->status.p_item = NULL; } - 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; @@ -332,7 +321,9 @@ check_input: else if( p_playlist->p_input->b_die ) { PL_DEBUG( "dying input" ); - msleep( 25000 ); // 25 ms + PL_UNLOCK; + msleep( INTF_IDLE_SLEEP ); + PL_LOCK; goto check_input; } /* This input has finished, ask it to die ! */ @@ -347,7 +338,7 @@ check_input: else if( p_playlist->p_input->i_state != INIT_S ) { PL_UNLOCK; - ObjectGarbageCollector( p_playlist ); + ObjectGarbageCollector( p_playlist, false ); PL_LOCK; } } @@ -358,31 +349,32 @@ 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_playlist->request.i_status != PLAYLIST_STOPPED ) + { + msg_Dbg( p_playlist, "starting new item" ); + p_item = playlist_NextItem( p_playlist ); - if( p_item == NULL ) - { + if( p_item == NULL ) + { msg_Dbg( p_playlist, "nothing to play" ); - if( b_playexit == VLC_TRUE ) + p_playlist->status.i_status = PLAYLIST_STOPPED; + PL_UNLOCK; + + if( b_playexit == true ) { msg_Info( p_playlist, "end of playlist, exiting" ); - p_playlist->p_libvlc->b_die = VLC_TRUE; + vlc_object_kill( p_playlist->p_libvlc ); } - p_playlist->status.i_status = PLAYLIST_STOPPED; - PL_UNLOCK + ObjectGarbageCollector( p_playlist, true ); return; } playlist_PlayItem( p_playlist, p_item ); } 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 ) @@ -394,14 +386,20 @@ check_input: /* Collect garbage */ PL_UNLOCK; - ObjectGarbageCollector( p_playlist ); + ObjectGarbageCollector( p_playlist, b_gc_forced ); PL_LOCK; } } - PL_UNLOCK + 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; @@ -409,11 +407,10 @@ void playlist_LastLoop( playlist_t *p_playlist ) /* If there is an input, kill it */ while( 1 ) { - PL_LOCK - + PL_LOCK; if( p_playlist->p_input == NULL ) { - PL_UNLOCK + PL_UNLOCK; break; } @@ -424,16 +421,10 @@ void playlist_LastLoop( playlist_t *p_playlist ) /* Unlink current input */ p_input = p_playlist->p_input; p_playlist->p_input = NULL; - PL_UNLOCK + PL_UNLOCK; /* Destroy input */ - input_DestroyThread( p_input ); - /* Unlink current input (_after_ input_DestroyThread for vout - * garbage collector)*/ - vlc_object_detach( p_input ); - - /* Destroy object */ - vlc_object_destroy( p_input ); + vlc_object_release( p_input ); continue; } else if( p_playlist->p_input->b_die ) @@ -444,15 +435,14 @@ void playlist_LastLoop( playlist_t *p_playlist ) else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof ) { input_StopThread( p_playlist->p_input ); - PL_UNLOCK + PL_UNLOCK; continue; } else { p_playlist->p_input->b_eof = 1; } - - PL_UNLOCK + PL_UNLOCK; msleep( INTF_IDLE_SLEEP ); } @@ -461,6 +451,7 @@ void playlist_LastLoop( playlist_t *p_playlist ) 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 ); } @@ -473,9 +464,36 @@ void playlist_LastLoop( playlist_t *p_playlist ) 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 ); + } + + playlist_MLDump( p_playlist ); + + PL_LOCK; + 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 ); + + ARRAY_RESET( p_playlist->items ); + ARRAY_RESET( p_playlist->current ); + + PL_UNLOCK; } -/** Main loop for preparser queue */ +/** + * Preparse loop + * + * Main loop for preparser queue + * \param p_obj items to preparse + * \return nothing + */ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) { playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; @@ -485,113 +503,108 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) while( !p_playlist->b_die ) { - vlc_mutex_lock( &p_obj->object_lock ); + vlc_object_lock( p_obj ); while( p_obj->i_waiting == 0 ) { - vlc_cond_wait( &p_obj->object_wait, &p_obj->object_lock ); - if( p_playlist->b_die ) + if( vlc_object_wait( p_obj ) || p_playlist->b_die ) { - vlc_mutex_unlock( &p_obj->object_lock ); + vlc_object_unlock( p_obj ); return; } } 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_object_unlock( p_obj ); PL_LOCK; if( p_current ) { - vlc_bool_t b_preparsed = VLC_FALSE; - if( strncmp( p_current->psz_uri, "http:", 5 ) && - strncmp( p_current->psz_uri, "rtsp:", 5 ) && - strncmp( p_current->psz_uri, "udp:", 4 ) && - strncmp( p_current->psz_uri, "mms:", 4 ) && - strncmp( p_current->psz_uri, "cdda:", 4 ) && - strncmp( p_current->psz_uri, "dvd:", 4 ) && - strncmp( p_current->psz_uri, "v4l:", 4 ) && - strncmp( p_current->psz_uri, "dshow:", 6 ) ) + if( p_current->i_type == ITEM_TYPE_FILE ) { - b_preparsed = VLC_TRUE; stats_TimerStart( p_playlist, "Preparse run", STATS_TIMER_PREPARSE ); - PL_UNLOCK; - input_Preparse( p_playlist, p_current ); - PL_LOCK; + /* Do not preparse if it is already done (like by playing it) */ + if( !input_item_IsPreparsed( p_current ) ) + { + PL_UNLOCK; + input_Preparse( p_playlist, p_current ); + PL_LOCK; + } stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE ); - } - PL_UNLOCK; - if( b_preparsed ) - { - p_current->p_meta->i_status |= ITEM_PREPARSED; + PL_UNLOCK; + input_item_SetPreparsed( p_current, true ); var_SetInteger( p_playlist, "item-change", p_current->i_id ); + PL_LOCK; } - PL_LOCK; - /* If we haven't retrieved enough meta, add to secondary queue * which will run the "meta fetchers". * This only checks for meta, not for art * \todo don't do this for things we won't get meta for, like vids */ - if( p_current->p_meta && - !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o ) ) + 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 ); + 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 ); + p.b_fetch_art = false; + vlc_object_lock( p_playlist->p_fetcher ); INSERT_ELEM( p_playlist->p_fetcher->p_waiting, p_playlist->p_fetcher->i_waiting, p_playlist->p_fetcher->i_waiting, p); - vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock ); - vlc_cond_signal( &p_playlist->p_fetcher->object_wait ); + vlc_object_signal_unlocked( p_playlist->p_fetcher ); + vlc_object_unlock( p_playlist->p_fetcher ); } /* We already have all needed meta, but we need art right now */ - else if( p_current->p_meta && - p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL && - EMPTY_STR( p_current->p_meta->psz_arturl ) ) + else if( p_playlist->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", - p_current->psz_name ); + 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 ); + p.b_fetch_art = true; + vlc_object_lock( p_playlist->p_fetcher ); INSERT_ELEM( p_playlist->p_fetcher->p_waiting, p_playlist->p_fetcher->i_waiting, p_playlist->p_fetcher->i_waiting, p); - vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock ); - vlc_cond_signal( &p_playlist->p_fetcher->object_wait ); + vlc_object_signal_unlocked( p_playlist->p_fetcher ); + vlc_object_unlock( p_playlist->p_fetcher ); } else { PL_DEBUG( "no fetch required for %s (art currently %s)", - p_current->psz_name, - p_current->p_meta ? p_current->p_meta->psz_arturl: - "null" ); + psz_name, psz_arturl ); vlc_gc_decref( p_current ); } + free( psz_name ); + free( psz_arturl ); PL_UNLOCK; } else PL_UNLOCK; - 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 ); } } -/** 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; + bool b_fetch_art; input_item_t *p_item; int i_activity; @@ -614,23 +627,27 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) vlc_mutex_unlock( &p_obj->object_lock ); if( p_item ) { - assert( p_item->p_meta ); if( !b_fetch_art ) { - input_MetaFetch( p_playlist, p_item ); - p_item->p_meta->i_status |= ITEM_META_FETCHED; - var_SetInteger( p_playlist, "item-change", p_item->i_id ); + /* 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 ); + } + /* 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; + p.b_fetch_art = 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); + PL_DEBUG( "meta fetched for %s, get art", p_item->psz_name ); vlc_mutex_unlock( &p_obj->object_lock ); continue; } @@ -639,36 +656,53 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) } else { - int i_ret = input_ArtFind( p_playlist, p_item ); + 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++ ) + { + 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 ); + } + + i_ret = input_ArtFind( p_playlist, p_item ); if( i_ret == 1 ) { - PL_DEBUG("downloading art for %s", p_item->psz_name ); + PL_DEBUG( "downloading art for %s", p_item->psz_name ); if( input_DownloadAndCacheArt( p_playlist, p_item ) ) - p_item->p_meta->i_status |= ITEM_ART_NOTFOUND; + input_item_SetArtNotFound( p_item, true ); else { - p_item->p_meta->i_status |= ITEM_ART_FETCHED; + input_item_SetArtFetched( p_item, 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 ); - p_item->p_meta->i_status |= ITEM_ART_FETCHED; + 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 { - PL_DEBUG("art not found for %s", p_item->psz_name ); - p_item->p_meta->i_status |= ITEM_ART_NOTFOUND; + 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 ); } @@ -679,7 +713,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 ); @@ -699,7 +733,7 @@ static void VariablesInit( playlist_t *p_playlist ) var_Create( p_playlist, "intf-popupmenu", VLC_VAR_BOOL ); var_Create( p_playlist, "intf-show", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_playlist, "intf-show", val ); var_Create( p_playlist, "activity", VLC_VAR_INTEGER );