X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=27d1d73eedde1c359f5ca0101511464b9ad10cf0;hb=55f3a9f1dc708d536a61a8f65c8b3c854c14e360;hp=1ed3ec424ad1814c019063a5507aca551b240659;hpb=0e39834a0ac7ba0f9f492881ef90902f5d8fedd5;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 1ed3ec424a..27d1d73eed 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -22,6 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -65,6 +69,9 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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 ); @@ -94,21 +101,21 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) p_playlist->b_doing_ml = VLC_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, - 0 ); + 0, NULL ); p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL, - 0 ); + 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, 0 ); - p_playlist->p_local_onelevel = playlist_NodeCreate( p_playlist, - _( "Playlist" ), p_playlist->p_root_onelevel, 0 ); + playlist_NodesPairCreate( p_playlist, _( "Playlist" ), + &p_playlist->p_local_category, + &p_playlist->p_local_onelevel, VLC_FALSE ); + p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG; p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG; @@ -117,25 +124,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, 0 ); - p_playlist->p_ml_onelevel = playlist_NodeCreate( p_playlist, - _( "Media Library" ), p_playlist->p_root_onelevel, 0 ); + playlist_NodesPairCreate( p_playlist, _( "Media Library" ), + &p_playlist->p_ml_category, + &p_playlist->p_ml_onelevel, VLC_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 { @@ -151,6 +150,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; playlist_MLLoad( p_playlist ); @@ -158,12 +158,19 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) return p_playlist; } +/** + * Destroy playlist + * + * Destroy a playlist structure. + * \param p_playlist the playlist object + * \return nothing + */ void playlist_Destroy( playlist_t *p_playlist ) { 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" ); @@ -174,27 +181,30 @@ void playlist_Destroy( playlist_t *p_playlist ) vlc_mutex_destroy( &p_playlist->gc_lock ); vlc_object_detach( p_playlist ); - vlc_object_destroy( p_playlist ); + vlc_object_release( p_playlist ); } /* Destroy remaining objects */ -static void ObjectGarbageCollector( playlist_t *p_playlist ) +static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t 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 = VLC_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, 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; @@ -207,7 +217,7 @@ 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; @@ -221,7 +231,13 @@ static void ObjectGarbageCollector( playlist_t *p_playlist ) 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; @@ -231,7 +247,7 @@ void playlist_MainLoop( playlist_t *p_playlist ) 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(); } @@ -258,7 +274,7 @@ check_input: /* Release the playlist lock, because we may get stuck * in input_DestroyThread() for some time. */ - PL_UNLOCK + PL_UNLOCK; /* Destroy input */ input_DestroyThread( p_input ); @@ -279,7 +295,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; @@ -289,7 +305,7 @@ check_input: { PL_DEBUG( "dying input" ); PL_UNLOCK; - msleep( 25000 ); // 25 ms + msleep( INTF_IDLE_SLEEP ); PL_LOCK; goto check_input; } @@ -305,7 +321,7 @@ check_input: else if( p_playlist->p_input->i_state != INIT_S ) { PL_UNLOCK; - ObjectGarbageCollector( p_playlist ); + ObjectGarbageCollector( p_playlist, VLC_FALSE ); PL_LOCK; } } @@ -316,31 +332,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" ); + p_playlist->status.i_status = PLAYLIST_STOPPED; + PL_UNLOCK; + if( b_playexit == VLC_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, VLC_TRUE ); return; } playlist_PlayItem( p_playlist, p_item ); } else { + const vlc_bool_t 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 ) @@ -352,14 +369,21 @@ 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; @@ -367,11 +391,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; } @@ -382,7 +405,7 @@ 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 ); @@ -396,15 +419,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 ); } @@ -430,7 +452,7 @@ void playlist_LastLoop( playlist_t *p_playlist ) while( p_playlist->i_sds ) { playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->pp_sds[0]->psz_module ); + p_playlist->pp_sds[0]->p_sd->psz_module ); } playlist_MLDump( p_playlist ); @@ -457,7 +479,13 @@ void playlist_LastLoop( playlist_t *p_playlist ) 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; @@ -467,109 +495,104 @@ 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, VLC_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 ); + 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 ); + 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; @@ -596,12 +619,16 @@ 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 ) { @@ -612,7 +639,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) 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; } @@ -621,36 +648,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++ ) + { + 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 ); + 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, VLC_TRUE ); else { - p_item->p_meta->i_status |= ITEM_ART_FETCHED; + 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 ); - 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, VLC_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, VLC_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 ); }