X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=e44d1279aa00726c8d14a0bf1b438545ba9a98d9;hb=741a3b31368e461b53dd3ea11af80c9f75c160f8;hp=1c9d8f40fd83a70fbe83684362d13b9f7bcfc024;hpb=52f8ccc47889f56b2731a9a46b4ef2b6e6534c55;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 1c9d8f40fd..e44d1279aa 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 @@ -66,8 +70,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) return NULL; } - p_playlist->p_internal = malloc(sizeof(struct playlist_internal_t)); - memset( p_playlist->p_internal, 0, sizeof(struct playlist_internal_t) ); + TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds ); p_parent->p_libvlc->p_playlist = p_playlist; @@ -98,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; @@ -121,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 { @@ -162,12 +157,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" ); @@ -178,7 +180,6 @@ void playlist_Destroy( playlist_t *p_playlist ) vlc_mutex_destroy( &p_playlist->gc_lock ); vlc_object_detach( p_playlist ); - free( p_playlist->p_internal ); vlc_object_destroy( p_playlist ); } @@ -229,7 +230,13 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, vlc_bool_t b_force ) 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; @@ -239,7 +246,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(); } @@ -266,7 +273,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 ); @@ -287,7 +294,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; @@ -297,7 +304,7 @@ check_input: { PL_DEBUG( "dying input" ); PL_UNLOCK; - msleep( 25000 ); // 25 ms + msleep( INTF_IDLE_SLEEP ); PL_LOCK; goto check_input; } @@ -324,26 +331,23 @@ 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" ); vlc_object_kill( p_playlist->p_libvlc ); } - p_playlist->status.i_status = PLAYLIST_STOPPED; - PL_UNLOCK - ObjectGarbageCollector( p_playlist, VLC_TRUE ); return; } @@ -368,10 +372,17 @@ check_input: 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; @@ -379,11 +390,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; } @@ -394,7 +404,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 ); @@ -408,15 +418,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 ); } @@ -439,10 +448,10 @@ void playlist_LastLoop( playlist_t *p_playlist ) vout_Destroy( (vout_thread_t *)p_obj ); } - while( p_playlist->p_internal->i_asds ) + while( p_playlist->i_sds ) { playlist_ServicesDiscoveryRemove( p_playlist, - p_playlist->p_internal->pp_asds[0]->p_sd->psz_module ); + p_playlist->pp_sds[0]->p_sd->psz_module ); } playlist_MLDump( p_playlist ); @@ -469,7 +478,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; @@ -497,17 +512,8 @@ void playlist_PreparseLoop( playlist_preparse_t *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 ); /* Do not preparse if it is already done (like by playing it) */ @@ -518,15 +524,11 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) PL_LOCK; } stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE ); - } - PL_UNLOCK; - if( b_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 @@ -537,19 +539,19 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) 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 ); 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_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 && - EMPTY_STR( psz_arturl ) ) + ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) ) { preparse_item_t p; PL_DEBUG("meta ok for %s, need to fetch art", psz_name ); @@ -559,8 +561,8 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) 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_mutex_unlock( &p_playlist->p_fetcher->object_lock ); } else { @@ -584,7 +586,13 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) } } -/** 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; @@ -613,8 +621,14 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) { if( !b_fetch_art ) { - input_MetaFetch( p_playlist, p_item ); - 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 ) { @@ -625,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; } @@ -654,7 +668,7 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) 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 ) ) input_item_SetArtNotFound( p_item, VLC_TRUE ); else { @@ -665,13 +679,13 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) } else if( i_ret == 0 ) /* Was in cache */ { - PL_DEBUG("found art for %s in cache", p_item->psz_name ); + 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 ); + PL_DEBUG( "art not found for %s", p_item->psz_name ); input_item_SetArtNotFound( p_item, VLC_TRUE ); } vlc_gc_decref( p_item );