X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=190442ad7d9b765e5b1a0a940af32372ea39602f;hb=35f17389483e42d5454e88f7ce881f29d08f6f66;hp=7a5baf72fd990bb58c7caf15827b8c6aef9e387a;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index 7a5baf72fd..190442ad7d 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 @@ -26,8 +25,9 @@ # include "config.h" #endif -#include -#include +#include +#include +#include #include #include #include @@ -44,9 +44,14 @@ 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_playlist = (playlist_t*)p_this; - ((playlist_t*)p_this)->b_reset_currently_playing = true; - playlist_Signal( ((playlist_t*)p_this) ); + PL_LOCK; + + pl_priv(p_playlist)->b_reset_currently_playing = true; + vlc_object_signal_unlocked( p_playlist ); + + PL_UNLOCK; return VLC_SUCCESS; } @@ -61,61 +66,61 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) { static const char playlist_name[] = "playlist"; playlist_t *p_playlist; - bool b_save; - int i_tree; + playlist_private_t *p; /* Allocate structure */ - 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" ); + p = vlc_custom_create( p_parent, sizeof( *p ), + VLC_OBJECT_GENERIC, playlist_name ); + if( !p ) return NULL; - } - TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds ); + assert( offsetof( playlist_private_t, public_data ) == 0 ); + p_playlist = &p->public_data; + TAB_INIT( pl_priv(p_playlist)->i_sds, pl_priv(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->p_input = NULL; + pl_priv(p_playlist)->i_last_playlist_id = 0; + pl_priv(p_playlist)->p_input = NULL; - p_playlist->gc_date = 0; - p_playlist->b_cant_sleep = false; + 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 ); ARRAY_INIT( p_playlist->current ); p_playlist->i_current_index = 0; - p_playlist->b_reset_currently_playing = true; - p_playlist->last_rebuild_date = 0; + pl_priv(p_playlist)->b_reset_currently_playing = true; + pl_priv(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); + pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" ); - p_playlist->b_doing_ml = false; + pl_priv(p_playlist)->b_doing_ml = false; - p_playlist->b_auto_preparse = + pl_priv(p_playlist)->b_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, false ); + PL_UNLOCK; p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG; p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG; @@ -127,9 +132,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, false ); + PL_UNLOCK; if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel) return NULL; @@ -143,19 +150,14 @@ 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 = false; - p_playlist->status.i_status = PLAYLIST_STOPPED; - - p_playlist->i_sort = SORT_ID; - p_playlist->i_order = ORDER_NORMAL; + pl_priv(p_playlist)->status.p_item = NULL; + pl_priv(p_playlist)->status.p_node = p_playlist->p_local_onelevel; + pl_priv(p_playlist)->request.b_request = false; + pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED; - - b_save = p_playlist->b_auto_preparse; - p_playlist->b_auto_preparse = false; + pl_priv(p_playlist)->b_auto_preparse = false; playlist_MLLoad( p_playlist ); - p_playlist->b_auto_preparse = true; + pl_priv(p_playlist)->b_auto_preparse = true; vlc_object_set_destructor( p_playlist, playlist_Destructor ); @@ -169,92 +171,161 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) * \param p_playlist the playlist object * \return nothing */ -void playlist_Destroy( playlist_t *p_playlist ) -{ - /* 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-popupmenu" ); - 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_object_release( p_playlist ); -} static void playlist_Destructor( vlc_object_t * p_this ) { - playlist_t * p_playlist = (playlist_t *)p_this; + playlist_t *p_playlist = (playlist_t *)p_this; + playlist_private_t *p_sys = pl_priv(p_playlist); - // Kill preparser - if( p_playlist->p_preparse ) - { - vlc_object_release( p_playlist->p_preparse ); - } + assert( !p_sys->p_sout ); + assert( !p_sys->p_preparser ); + assert( !p_sys->p_fetcher ); - // Kill meta fetcher - if( p_playlist->p_fetcher ) - { - vlc_object_release( p_playlist->p_fetcher ); - } + msg_Err( p_this, "Destroyed" ); } /* Destroy remaining objects */ 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 ) + if( mdate() - pl_priv(p_playlist)->gc_date < 1000000 ) { - p_playlist->b_cant_sleep = true; + pl_priv(p_playlist)->b_cant_sleep = true; return; } - else if( p_playlist->gc_date == 0 ) + else if( pl_priv(p_playlist)->gc_date == 0 ) return; } - vlc_mutex_lock( &p_playlist->gc_lock ); - while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT, - FIND_CHILD ) ) ) + pl_priv(p_playlist)->b_cant_sleep = false; +} + +/* 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; + + if( newval.i_int == INPUT_EVENT_ES ) + pl_priv(p_playlist)->gc_date = mdate(); + + vlc_object_signal_unlocked( p_playlist ); + + 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 ); + + if( p_input ) { - if( p_obj->p_parent != VLC_OBJECT(p_playlist->p_libvlc) ) - { - 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_hold( p_input ); + pl_priv(p_playlist)->p_input = p_input; + + var_AddCallback( p_input, "intf-event", InputEvent, 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 = pl_priv(p_playlist)->p_input; + if( p_input ) vlc_object_hold( 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 pl_priv(p_playlist)->status.p_item; +} + +playlist_item_t * get_current_status_node( playlist_t * p_playlist ) +{ + PL_ASSERT_LOCKED; + + return pl_priv(p_playlist)->status.p_node; +} + +void set_current_status_item( playlist_t * p_playlist, + playlist_item_t * p_item ) +{ + PL_ASSERT_LOCKED; + + if( pl_priv(p_playlist)->status.p_item && + pl_priv(p_playlist)->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG && + pl_priv(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( pl_priv(p_playlist)->status.p_item ); */ + } + pl_priv(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( pl_priv(p_playlist)->status.p_node && + pl_priv(p_playlist)->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG && + pl_priv(p_playlist)->status.p_node != p_node ) + { + /* It's unsafe given current design to delete a playlist item :( + playlist_ItemDelete( pl_priv(p_playlist)->status.p_node ); */ } - p_playlist->b_cant_sleep = false; - vlc_mutex_unlock( &p_playlist->gc_lock ); + pl_priv(p_playlist)->status.p_node = p_node; } /** * Main loop * - * Main loop for the playlist + * 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 */ @@ -262,66 +333,56 @@ void playlist_MainLoop( playlist_t *p_playlist ) { playlist_item_t *p_item = NULL; 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 + 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" ), - p_playlist->status.p_item ); - p_playlist->last_rebuild_date = mdate(); + 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( p_playlist->p_input ) + if( pl_priv(p_playlist)->p_input ) { - if( p_playlist->request.b_request && !p_playlist->p_input->b_die ) + 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( p_playlist->p_input ); + input_StopThread( pl_priv(p_playlist)->p_input ); } /* This input is dead. Remove it ! */ - if( p_playlist->p_input->b_dead ) + 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 = p_playlist->p_input; - p_playlist->p_input = NULL; + p_input = pl_priv(p_playlist)->p_input; - /* Release the playlist lock, because we may get stuck - * in vlc_object_release() for some time. */ - PL_UNLOCK; + assert( *pp_sout == NULL ); + if( var_CreateGetBool( p_input, "sout-keep" ) ) + *pp_sout = input_DetachSout( p_input ); /* Destroy input */ - vlc_object_release( p_input ); + playlist_release_current_input( p_playlist ); - PL_LOCK; - - p_playlist->gc_date = mdate(); - p_playlist->b_cant_sleep = 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; - } + 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( p_playlist->p_input->b_die ) + else if( pl_priv(p_playlist)->p_input->b_die ) { PL_DEBUG( "dying input" ); PL_UNLOCK; @@ -330,19 +391,17 @@ check_input: goto check_input; } /* This input has finished, ask it to die ! */ - else if( p_playlist->p_input->b_error - || p_playlist->p_input->b_eof ) + else if( pl_priv(p_playlist)->p_input->b_error + || pl_priv(p_playlist)->p_input->b_eof ) { PL_DEBUG( "finished input" ); - input_StopThread( p_playlist->p_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( p_playlist->p_input->i_state != INIT_S ) + else if( pl_priv(p_playlist)->p_input->i_state != INIT_S ) { - PL_UNLOCK; ObjectGarbageCollector( p_playlist, false ); - PL_LOCK; } } else @@ -353,7 +412,9 @@ check_input: * - Request, running requested -> start new item * - Request, stopped requested -> collect garbage */ - if( p_playlist->request.i_status != PLAYLIST_STOPPED ) + 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 ); @@ -361,8 +422,7 @@ check_input: if( p_item == NULL ) { msg_Dbg( p_playlist, "nothing to play" ); - p_playlist->status.i_status = PLAYLIST_STOPPED; - PL_UNLOCK; + pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED; if( b_playexit == true ) { @@ -371,29 +431,21 @@ check_input: } 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 ) - { - PL_DEBUG( "deleting item marked for deletion" ); - playlist_ItemDelete( p_playlist->status.p_item ); - p_playlist->status.p_item = NULL; } + 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 */ - PL_UNLOCK; ObjectGarbageCollector( p_playlist, b_gc_forced ); - PL_LOCK; } } - PL_UNLOCK; } /** @@ -405,310 +457,46 @@ check_input: */ void playlist_LastLoop( playlist_t *p_playlist ) { - vlc_object_t *p_obj; - /* If there is an input, kill it */ while( 1 ) { PL_LOCK; - if( p_playlist->p_input == NULL ) + if( pl_priv(p_playlist)->p_input == NULL ) { PL_UNLOCK; break; } - if( p_playlist->p_input->b_dead ) + if( pl_priv(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 */ - vlc_object_release( p_input ); + PL_UNLOCK; continue; } - else if( p_playlist->p_input->b_die ) + else if( pl_priv(p_playlist)->p_input->b_die ) { /* This input is dying, leave it alone */ ; } - else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof ) + else if( pl_priv(p_playlist)->p_input->b_error || pl_priv(p_playlist)->p_input->b_eof ) { - input_StopThread( p_playlist->p_input ); + input_StopThread( pl_priv(p_playlist)->p_input ); PL_UNLOCK; continue; } else { - p_playlist->p_input->b_eof = 1; + pl_priv(p_playlist)->p_input->b_eof = 1; } PL_UNLOCK; 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 ); - } - - 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; -} - -/** - * 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; - input_item_t *p_current; - int i_activity; - uint32_t i_m, i_o; - - while( !p_playlist->b_die ) - { - vlc_object_lock( p_obj ); - while( p_obj->i_waiting == 0 ) - { - if( vlc_object_wait( p_obj ) || p_playlist->b_die ) - { - 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_object_unlock( p_obj ); - - PL_LOCK; - if( p_current ) - { - 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 ); - 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 = 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_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_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", psz_name ); - p.p_item = p_current; - 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_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)", - psz_name, psz_arturl ); - vlc_gc_decref( p_current ); - } - free( psz_name ); - free( psz_arturl ); - PL_UNLOCK; - } - else - PL_UNLOCK; - - vlc_object_lock( p_obj ); - i_activity = var_GetInteger( p_playlist, "activity" ); - if( i_activity < 0 ) i_activity = 0; - vlc_object_unlock( p_obj ); - /* Sleep at least 1ms */ - msleep( (i_activity+1) * 1000 ); - } -} - -/** - * 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; - bool b_fetch_art; - input_item_t *p_item; - int i_activity; - - while( !p_playlist->b_die ) - { - 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; - } - } - - 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 ); - if( p_item ) - { - if( !b_fetch_art ) - { - /* 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 = 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; - } - else - vlc_gc_decref( p_item ); - } - 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++ ) - { - 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 ); - 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_object_lock( p_obj ); - i_activity = var_GetInteger( p_playlist, "activity" ); - if( i_activity < 0 ) i_activity = 0; - vlc_object_unlock( p_obj ); - /* Sleep at least 1ms */ - msleep( (i_activity+1) * 1000 ); - } } static void VariablesInit( playlist_t *p_playlist ) @@ -733,21 +521,39 @@ 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 = true; - var_Set( p_playlist, "intf-show", val ); - var_Create( p_playlist, "activity", VLC_VAR_INTEGER ); var_SetInteger( p_playlist, "activity", 0 ); /* Variables to control playback */ - var_CreateGetBool( p_playlist, "play-and-stop" ); - var_CreateGetBool( p_playlist, "play-and-exit" ); - var_CreateGetBool( p_playlist, "random" ); - var_CreateGetBool( p_playlist, "repeat" ); - var_CreateGetBool( p_playlist, "loop" ); + var_Create( p_playlist, "play-and-stop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_playlist, "play-and-exit", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_playlist, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_AddCallback( p_playlist, "random", RandomCallback, NULL ); + + /* */ + var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); +} + +int playlist_CurrentId( playlist_t * p_playlist ) +{ + return pl_priv(p_playlist)->status.p_item->i_id; +} + +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) ); +} + +playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist ) +{ + return pl_priv(p_playlist)->status.p_item; +} + +int playlist_Status( playlist_t * p_playlist ) +{ + return pl_priv(p_playlist)->status.i_status; }