X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=8a40f47a50023eb769d26dd0532d26977b0b2e2e;hb=addf17f0887177964c56bd27856f88de3f0e3509;hp=14a62437ca960f1ed8212011a6d40b63dcf0b783;hpb=69a38c569e6f79e0a9200f7e8a0696c0b50823fe;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 14a62437ca..8a40f47a50 100644 --- a/src/playlist/engine.c +++ b/src/playlist/engine.c @@ -38,7 +38,6 @@ * 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 ) @@ -49,7 +48,7 @@ static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd, PL_LOCK; pl_priv(p_playlist)->b_reset_currently_playing = true; - vlc_object_signal_unlocked( p_playlist ); + vlc_cond_signal( &pl_priv(p_playlist)->signal ); PL_UNLOCK; return VLC_SUCCESS; @@ -76,19 +75,19 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) assert( offsetof( playlist_private_t, public_data ) == 0 ); p_playlist = &p->public_data; + vlc_object_attach( p_playlist, p_parent ); TAB_INIT( pl_priv(p_playlist)->i_sds, pl_priv(p_playlist)->pp_sds ); libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist; VariablesInit( p_playlist ); + vlc_mutex_init( &p->lock ); + vlc_cond_init( &p->signal ); /* Initialise data structures */ pl_priv(p_playlist)->i_last_playlist_id = 0; pl_priv(p_playlist)->p_input = NULL; - pl_priv(p_playlist)->gc_date = 0; - pl_priv(p_playlist)->b_cant_sleep = false; - ARRAY_INIT( p_playlist->items ); ARRAY_INIT( p_playlist->all_items ); ARRAY_INIT( pl_priv(p_playlist)->items_to_delete ); @@ -98,190 +97,127 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) pl_priv(p_playlist)->b_reset_currently_playing = true; pl_priv(p_playlist)->last_rebuild_date = 0; - pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" ); + pl_priv(p_playlist)->b_tree = var_InheritBool( p_parent, "playlist-tree" ); pl_priv(p_playlist)->b_doing_ml = false; pl_priv(p_playlist)->b_auto_preparse = - var_CreateGetBool( p_playlist, "auto-preparse" ) ; + var_InheritBool( p_parent, "auto-preparse" ); + + /* Fetcher */ + p->p_fetcher = playlist_fetcher_New( p_playlist ); + if( unlikely(p->p_fetcher == NULL) ) + { + msg_Err( p_playlist, "cannot create fetcher" ); + p->p_preparser = NULL; + } + else + { /* Preparse */ + p->p_preparser = playlist_preparser_New( p_playlist, p->p_fetcher ); + if( unlikely(p->p_preparser == NULL) ) + msg_Err( p_playlist, "cannot create preparser" ); + } - 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 ); + /* Create the root node */ + PL_LOCK; + p_playlist->p_root = playlist_NodeCreate( p_playlist, NULL, NULL, + PLAYLIST_END, 0, NULL ); PL_UNLOCK; + if( !p_playlist->p_root ) return NULL; - if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel ) - return NULL; + /* Create currently playing items node */ + PL_LOCK; + p_playlist->p_playing = playlist_NodeCreate( + p_playlist, _( "Playlist" ), p_playlist->p_root, + PLAYLIST_END, PLAYLIST_RO_FLAG, 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; + if( !p_playlist->p_playing ) return NULL; - if( !p_playlist->p_local_category || !p_playlist->p_local_onelevel || - !p_playlist->p_local_category->p_input || - !p_playlist->p_local_onelevel->p_input ) - return NULL; - - if( config_GetInt( p_playlist, "media-library") ) + /* Create media library node */ + const bool b_ml = var_InheritBool( p_parent, "media-library"); + if( b_ml ) { - 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_LOCK; + p_playlist->p_media_library = playlist_NodeCreate( + p_playlist, _( "Media Library" ), p_playlist->p_root, + PLAYLIST_END, PLAYLIST_RO_FLAG, NULL ); PL_UNLOCK; - 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; + if(!p_playlist->p_media_library ) return NULL; } else { - p_playlist->p_ml_category = p_playlist->p_ml_onelevel = NULL; + p_playlist->p_media_library = NULL; } + p_playlist->p_root_category = p_playlist->p_root; + p_playlist->p_root_onelevel = p_playlist->p_root; + p_playlist->p_local_category = p_playlist->p_playing; + p_playlist->p_local_onelevel = p_playlist->p_playing; + p_playlist->p_ml_category = p_playlist->p_media_library; + p_playlist->p_ml_onelevel = p_playlist->p_media_library;; + /* Initial status */ pl_priv(p_playlist)->status.p_item = NULL; - pl_priv(p_playlist)->status.p_node = p_playlist->p_local_onelevel; + pl_priv(p_playlist)->status.p_node = p_playlist->p_playing; pl_priv(p_playlist)->request.b_request = false; pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED; - pl_priv(p_playlist)->b_auto_preparse = false; - playlist_MLLoad( p_playlist ); - pl_priv(p_playlist)->b_auto_preparse = true; - - vlc_object_set_destructor( p_playlist, playlist_Destructor ); + if(b_ml) + { + const bool b_auto_preparse = pl_priv(p_playlist)->b_auto_preparse; + pl_priv(p_playlist)->b_auto_preparse = false; + playlist_MLLoad( p_playlist ); + pl_priv(p_playlist)->b_auto_preparse = b_auto_preparse; + } return p_playlist; } /** - * Destroy playlist + * Destroy playlist. + * This is not thread-safe. Any reference to the playlist is assumed gone. + * (In particular, all interface and services threads must have been joined). * - * Destroy a playlist structure. * \param p_playlist the playlist object - * \return nothing */ - -static void playlist_Destructor( vlc_object_t * p_this ) -{ - playlist_t * p_playlist = (playlist_t *)p_this; - - /* Destroy the item preparser */ - playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse; - 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 */ - playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher; - if (p_fetcher->up) - { - vlc_cancel (p_fetcher->thread); - vlc_join (p_fetcher->thread, NULL); - } - while (p_fetcher->i_waiting > 0) - { /* Any left-over unparsed item? */ - vlc_gc_decref (p_fetcher->pp_waiting[0]); - REMOVE_ELEM (p_fetcher->pp_waiting, p_fetcher->i_waiting, 0); - } - vlc_cond_destroy (&p_fetcher->wait); - vlc_mutex_destroy (&p_fetcher->lock); - - msg_Dbg( p_this, "Destroyed" ); -} - -/* Destroy remaining objects */ -static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) +void playlist_Destroy( playlist_t *p_playlist ) { - if( !b_force ) - { - if( mdate() - pl_priv(p_playlist)->gc_date < 1000000 ) - { - pl_priv(p_playlist)->b_cant_sleep = true; - return; - } - else if( pl_priv(p_playlist)->gc_date == 0 ) - return; - } - - pl_priv(p_playlist)->b_cant_sleep = false; -} + playlist_private_t *p_sys = pl_priv(p_playlist); -/* Input Callback */ -static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); - playlist_t *p_playlist = p_data; - - if( newval.i_int != INPUT_EVENT_STATE && - newval.i_int != INPUT_EVENT_ES ) - return VLC_SUCCESS; - - PL_LOCK; + msg_Dbg( p_playlist, "destroying" ); + if( p_sys->p_preparser ) + playlist_preparser_Delete( p_sys->p_preparser ); + if( p_sys->p_fetcher ) + playlist_fetcher_Delete( p_sys->p_fetcher ); - if( newval.i_int == INPUT_EVENT_ES ) - pl_priv(p_playlist)->gc_date = mdate(); + /* Already cleared when deactivating (if activated anyway) */ + assert( !p_sys->p_input ); + assert( !p_sys->p_input_resource ); - vlc_object_signal_unlocked( p_playlist ); + vlc_cond_destroy( &p_sys->signal ); + vlc_mutex_destroy( &p_sys->lock ); - PL_UNLOCK; - return VLC_SUCCESS; -} - -/* Internals */ -void playlist_release_current_input( playlist_t * p_playlist ) -{ - PL_ASSERT_LOCKED; - - if( !pl_priv(p_playlist)->p_input ) return; - - input_thread_t * p_input = pl_priv(p_playlist)->p_input; - - var_DelCallback( p_input, "intf-event", InputEvent, p_playlist ); - pl_priv(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 ); + /* Remove all remaining items */ + 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_sys->items_to_delete ) + free( p_del->pp_children ); + vlc_gc_decref( p_del->p_input ); + free( p_del ); + FOREACH_END(); + ARRAY_RESET( p_sys->items_to_delete ); - if( p_input ) - { - vlc_object_hold( p_input ); - pl_priv(p_playlist)->p_input = p_input; + ARRAY_RESET( p_playlist->items ); + ARRAY_RESET( p_playlist->current ); - var_AddCallback( p_input, "intf-event", InputEvent, p_playlist ); - } + vlc_object_release( p_playlist ); } /** Get current playing input. @@ -346,414 +282,28 @@ void set_current_status_node( playlist_t * p_playlist, pl_priv(p_playlist)->status.p_node = p_node; } -/** - * 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 ) +static input_thread_t *playlist_FindInput( vlc_object_t *object ) { - playlist_item_t *p_item = NULL; - bool b_playexit = var_GetBool( p_playlist, "play-and-exit" ); - - PL_ASSERT_LOCKED; - - if( pl_priv(p_playlist)->b_reset_currently_playing && - mdate() - pl_priv(p_playlist)->last_rebuild_date > 30000 ) // 30 ms - { - ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ), - get_current_status_item( p_playlist ) ); - pl_priv(p_playlist)->last_rebuild_date = mdate(); - } - -check_input: - /* If there is an input, check that it doesn't need to die. */ - if( pl_priv(p_playlist)->p_input ) - { - if( pl_priv(p_playlist)->request.b_request && !pl_priv(p_playlist)->p_input->b_die ) - { - PL_DEBUG( "incoming request - stopping current input" ); - input_StopThread( pl_priv(p_playlist)->p_input ); - } - - /* This input is dead. Remove it ! */ - if( pl_priv(p_playlist)->p_input->b_dead ) - { - 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 = pl_priv(p_playlist)->p_input; - - assert( *pp_sout == NULL ); - if( var_CreateGetBool( p_input, "sout-keep" ) ) - *pp_sout = input_DetachSout( p_input ); - - /* Destroy input */ - playlist_release_current_input( p_playlist ); - - pl_priv(p_playlist)->gc_date = mdate(); - pl_priv(p_playlist)->b_cant_sleep = true; - - 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 */ - else if( pl_priv(p_playlist)->p_input->b_die ) - { - PL_DEBUG( "dying input" ); - PL_UNLOCK; - msleep( INTF_IDLE_SLEEP ); - PL_LOCK; - goto check_input; - } - /* This input has finished, ask it to die ! */ - else if( pl_priv(p_playlist)->p_input->b_error - || pl_priv(p_playlist)->p_input->b_eof ) - { - PL_DEBUG( "finished input" ); - input_StopThread( pl_priv(p_playlist)->p_input ); - /* No need to wait here, we'll wait in the p_input->b_die case */ - goto check_input; - } - else if( pl_priv(p_playlist)->p_input->i_state != INIT_S ) - { - ObjectGarbageCollector( p_playlist, false ); - } - } - else - { - /* No input. Several cases - * - No request, running status -> start new item - * - No request, stopped status -> collect garbage - * - Request, running requested -> start new item - * - Request, stopped requested -> collect garbage - */ - int i_status = pl_priv(p_playlist)->request.b_request ? - pl_priv(p_playlist)->request.i_status : pl_priv(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" ); - pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED; - - if( b_playexit == true ) - { - msg_Info( p_playlist, "end of playlist, exiting" ); - vlc_object_kill( p_playlist->p_libvlc ); - } - ObjectGarbageCollector( p_playlist, true ); - return; - } - playlist_PlayItem( p_playlist, p_item ); - /* playlist_PlayItem loose input event, we need to recheck */ - goto check_input; - } - else - { - const bool b_gc_forced = pl_priv(p_playlist)->status.i_status != PLAYLIST_STOPPED; - - pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED; - - /* Collect garbage */ - ObjectGarbageCollector( p_playlist, b_gc_forced ); - } - } -} - -/** - * 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 ) -{ - /* If there is an input, kill it */ - while( 1 ) - { - PL_LOCK; - if( pl_priv(p_playlist)->p_input == NULL ) - { - PL_UNLOCK; - break; - } - - if( pl_priv(p_playlist)->p_input->b_dead ) - { - /* 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 */ - - PL_UNLOCK; - continue; - } - else if( pl_priv(p_playlist)->p_input->b_die ) - { - /* This input is dying, leave it alone */ - ; - } - else if( pl_priv(p_playlist)->p_input->b_error || pl_priv(p_playlist)->p_input->b_eof ) - { - input_StopThread( pl_priv(p_playlist)->p_input ); - PL_UNLOCK; - continue; - } - else - { - pl_priv(p_playlist)->p_input->b_eof = 1; - } - PL_UNLOCK; - - msleep( INTF_IDLE_SLEEP ); - } - -#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 ); - - 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, pl_priv(p_playlist)->items_to_delete ) - free( p_del->pp_children ); - vlc_gc_decref( p_del->p_input ); - free( p_del ); - FOREACH_END(); - ARRAY_RESET( pl_priv(p_playlist)->items_to_delete ); - - ARRAY_RESET( p_playlist->items ); - ARRAY_RESET( p_playlist->current ); - - PL_UNLOCK; -} - -/** - * Preparse queue loop - * - * @param p_obj preparse structure - * @return never - */ -void *playlist_PreparseLoop( void *data ) -{ - playlist_preparse_t *p_preparse = data; - playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_preparse) - - offsetof(playlist_private_t, preparse)))->public_data; - - for( ;; ) - { - input_item_t *p_current; - - 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( ); - - if( p_current ) - { - int canc = vlc_savecancel (); - PL_LOCK; - if( p_current->i_type == ITEM_TYPE_FILE ) - { - stats_TimerStart( p_playlist, "Preparse run", - STATS_TIMER_PREPARSE ); - /* 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; - input_item_SetPreparsed( p_current, true ); - var_SetInteger( p_playlist, "item-change", p_current->i_id ); - 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 - */ - char *psz_arturl = input_item_GetArtURL( p_current ); - char *psz_name = input_item_GetName( p_current ); - playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher; - if( p_fetcher->i_art_policy == ALBUM_ART_ALL && - ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) ) - { - PL_DEBUG("meta ok for %s, need to fetch art", psz_name ); - vlc_mutex_lock( &p_fetcher->lock ); - INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, - p_fetcher->i_waiting, p_current); - vlc_cond_signal( &p_fetcher->wait ); - vlc_mutex_unlock( &p_fetcher->lock ); - } - else - { - PL_DEBUG( "no fetch required for %s (art currently %s)", - psz_name, psz_arturl ); - vlc_gc_decref( p_current ); - } - free( psz_name ); - free( psz_arturl ); - PL_UNLOCK; - vlc_restorecancel( canc ); - } - - int i_activity = var_GetInteger( p_playlist, "activity" ); - if( i_activity < 0 ) i_activity = 0; - /* Sleep at least 1ms */ - msleep( (i_activity+1) * 1000 ); - } - - assert( 0 ); - return NULL; -} - -/** - * Fetcher loop - * - * \return never - */ -void *playlist_FetcherLoop( void *data ) -{ - playlist_fetcher_t *p_fetcher = data; - playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_fetcher) - - offsetof(playlist_private_t, fetcher)))->public_data; - - for( ;; ) - { - input_item_t *p_item; - - vlc_mutex_lock( &p_fetcher->lock ); - mutex_cleanup_push( &p_fetcher->lock ); - - while( p_fetcher->i_waiting == 0 ) - vlc_cond_wait( &p_fetcher->wait, &p_fetcher->lock ); - - p_item = p_fetcher->pp_waiting[0]; - REMOVE_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, 0 ); - vlc_cleanup_run( ); - - int canc = vlc_savecancel(); - if( 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 = ( !pl_priv(p_playlist)->p_input || input_GetItem(pl_priv(p_playlist)->p_input) != p_item || - pl_priv(p_playlist)->p_input->b_die || pl_priv(p_playlist)->p_input->b_eof || pl_priv(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, true ); - else { - 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 ); - 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 ); - input_item_SetArtNotFound( p_item, true ); - } - vlc_gc_decref( p_item ); - } - vlc_restorecancel( canc ); - - int i_activity = var_GetInteger( p_playlist, "activity" ); - if( i_activity < 0 ) i_activity = 0; - /* Sleep at least 1ms */ - msleep( (i_activity+1) * 1000 ); - } - - assert( 0 ); - return NULL; + assert( object == VLC_OBJECT(pl_Get(object)) ); + return playlist_CurrentInput( (playlist_t *)object ); } 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 = true; - var_Set( p_playlist, "intf-change", val ); + var_SetBool( p_playlist, "intf-change", true ); - var_Create( p_playlist, "item-change", VLC_VAR_INTEGER ); - val.i_int = -1; - var_Set( p_playlist, "item-change", val ); + var_Create( p_playlist, "item-change", VLC_VAR_ADDRESS ); + var_Create( p_playlist, "leaf-to-parent", VLC_VAR_ADDRESS ); - var_Create( p_playlist, "item-deleted", VLC_VAR_INTEGER ); - val.i_int = -1; - var_Set( p_playlist, "item-deleted", val ); + var_Create( p_playlist, "playlist-item-deleted", VLC_VAR_INTEGER ); + var_SetInteger( p_playlist, "playlist-item-deleted", -1 ); - var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS ); + var_Create( p_playlist, "playlist-item-append", VLC_VAR_ADDRESS ); - var_Create( p_playlist, "playlist-current", VLC_VAR_INTEGER ); - val.i_int = -1; - var_Set( p_playlist, "playlist-current", val ); + var_Create( p_playlist, "item-current", VLC_VAR_ADDRESS ); + var_Create( p_playlist, "input-current", VLC_VAR_ADDRESS ); var_Create( p_playlist, "activity", VLC_VAR_INTEGER ); var_SetInteger( p_playlist, "activity", 0 ); @@ -766,25 +316,34 @@ static void VariablesInit( playlist_t *p_playlist ) var_Create( p_playlist, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_AddCallback( p_playlist, "random", RandomCallback, NULL ); -} -int playlist_CurrentId( playlist_t * p_playlist ) -{ - return pl_priv(p_playlist)->status.p_item->i_id; -} + /* */ + var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); -bool playlist_IsPlaying( playlist_t * p_playlist ) -{ - return ( pl_priv(p_playlist)->status.i_status == PLAYLIST_RUNNING && - !(pl_priv(p_playlist)->request.b_request && pl_priv(p_playlist)->request.i_status == PLAYLIST_STOPPED) ); + /* Variables to preserve video output parameters */ + var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + + /* Audio output parameters */ + var_Create( p_playlist, "volume-muted", VLC_VAR_BOOL ); + var_Create( p_playlist, "saved-volume", VLC_VAR_INTEGER ); + var_Create( p_playlist, "volume-change", VLC_VAR_VOID ); + /* FIXME: horrible hack for audio output interface code */ + var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS ); + var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput ); } playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist ) { + PL_ASSERT_LOCKED; + return pl_priv(p_playlist)->status.p_item; } int playlist_Status( playlist_t * p_playlist ) { + PL_ASSERT_LOCKED; + return pl_priv(p_playlist)->status.i_status; } +