X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=4eae3faadb43c19198ef8c8d1771bbdb42d6ac1a;hb=35506f4d2f1f31e36eb8fe09f6cd1cb602065507;hp=e6cfc3a3825b86eeee03c46d5f41ec557292b19d;hpb=20a560c6adbf97a3129e090d5d323c15694def58;p=vlc diff --git a/src/playlist/engine.c b/src/playlist/engine.c index e6cfc3a382..4eae3faadb 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,6 +25,7 @@ # include "config.h" #endif +#include #include #include #include @@ -39,7 +39,6 @@ *****************************************************************************/ static void VariablesInit( playlist_t *p_playlist ); static void playlist_Destructor( vlc_object_t * p_this ); -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 ) @@ -62,30 +61,33 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) { static const char playlist_name[] = "playlist"; playlist_t *p_playlist; + playlist_private_t *p; bool b_save; /* Allocate structure */ - p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ), - VLC_OBJECT_GENERIC, playlist_name ); - if( !p_playlist ) + 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 ); libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist; VariablesInit( p_playlist ); /* Initialise data structures */ - vlc_mutex_init( &p_playlist->gc_lock ); p_playlist->i_last_playlist_id = 0; - p_playlist->p_input = NULL; + pl_priv(p_playlist)->p_input = NULL; p_playlist->gc_date = 0; 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; @@ -99,18 +101,22 @@ playlist_t * playlist_Create( vlc_object_t *p_parent ) 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; @@ -122,9 +128,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; @@ -138,10 +146,10 @@ 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; + 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; p_playlist->i_sort = SORT_ID; p_playlist->i_order = ORDER_NORMAL; @@ -169,21 +177,42 @@ static void playlist_Destructor( vlc_object_t * p_this ) { playlist_t * p_playlist = (playlist_t *)p_this; - if( p_playlist->p_preparse ) - vlc_object_release( p_playlist->p_preparse ); + /* 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); - if( p_playlist->p_fetcher ) - vlc_object_release( p_playlist->p_fetcher ); -#ifndef NDEBUG - libvlc_priv (p_this->p_libvlc)->p_playlist = NULL; /* pl_Yield() will fail */ -#endif + /* 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 ) { - vlc_object_t *p_obj; - if( !b_force ) { if( mdate() - p_playlist->gc_date < 1000000 ) @@ -195,9 +224,7 @@ static void ObjectGarbageCollector( playlist_t *p_playlist, bool b_force ) return; } - vlc_mutex_lock( &p_playlist->gc_lock ); p_playlist->b_cant_sleep = false; - vlc_mutex_unlock( &p_playlist->gc_lock ); } /* Input Callback */ @@ -222,22 +249,23 @@ static void input_selected_stream_changed( const vlc_event_t * event, void * dat /* Internals */ void playlist_release_current_input( playlist_t * p_playlist ) { - vlc_assert_locked( &(vlc_internals(p_playlist)->lock) ); + PL_ASSERT_LOCKED; - if( !p_playlist->p_input ) return; + if( !pl_priv(p_playlist)->p_input ) return; - input_thread_t * p_input = p_playlist->p_input; + input_thread_t * p_input = pl_priv(p_playlist)->p_input; vlc_event_manager_t * p_em = input_get_event_manager( p_input ); vlc_event_detach( p_em, vlc_InputStateChanged, input_state_changed, p_playlist ); vlc_event_detach( p_em, vlc_InputSelectedStreamChanged, input_selected_stream_changed, p_playlist ); - p_playlist->p_input = NULL; + 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; } @@ -245,14 +273,14 @@ void playlist_release_current_input( playlist_t * p_playlist ) void playlist_set_current_input( playlist_t * p_playlist, input_thread_t * p_input ) { - vlc_assert_locked( &(vlc_internals(p_playlist)->lock) ); + PL_ASSERT_LOCKED; playlist_release_current_input( p_playlist ); if( p_input ) { - vlc_object_yield( p_input ); - p_playlist->p_input = p_input; + vlc_object_hold( p_input ); + pl_priv(p_playlist)->p_input = p_input; vlc_event_manager_t * p_em = input_get_event_manager( p_input ); vlc_event_attach( p_em, vlc_InputStateChanged, input_state_changed, p_playlist ); @@ -261,15 +289,73 @@ void playlist_set_current_input( } } +/** 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 ) + { + /* 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 ); */ + } + 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 */ @@ -277,37 +363,37 @@ 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; + + PL_ASSERT_LOCKED; if( p_playlist->b_reset_currently_playing && mdate() - p_playlist->last_rebuild_date > 30000 ) // 30 ms { ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ), - p_playlist->status.p_item ); + get_current_status_item( p_playlist ) ); 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 = - &libvlc_priv(p_playlist->p_libvlc)->p_sout; + sout_instance_t **pp_sout = &pl_priv(p_playlist)->p_sout; PL_DEBUG( "dead input" ); - p_input = p_playlist->p_input; + p_input = pl_priv(p_playlist)->p_input; assert( *pp_sout == NULL ); if( var_CreateGetBool( p_input, "sout-keep" ) ) @@ -319,17 +405,6 @@ check_input: 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; - } - i_activity= var_GetInteger( p_playlist, "activity" ); var_SetInteger( p_playlist, "activity", i_activity - DEFAULT_INPUT_ACTIVITY ); @@ -337,7 +412,7 @@ check_input: 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; @@ -346,19 +421,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 @@ -369,8 +442,8 @@ check_input: * - Request, running requested -> start new item * - Request, stopped requested -> collect garbage */ - int i_status = p_playlist->request.b_request ? - p_playlist->request.i_status : p_playlist->status.i_status; + 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" ); @@ -379,8 +452,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 ) { @@ -389,29 +461,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; } /** @@ -423,19 +487,17 @@ 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 ) { /* remove input */ playlist_release_current_input( p_playlist ); @@ -446,20 +508,20 @@ void playlist_LastLoop( playlist_t *p_playlist ) 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; @@ -468,7 +530,7 @@ void playlist_LastLoop( playlist_t *p_playlist ) #ifdef ENABLE_SOUT /* close the remaining sout-keep (if there was no input atm) */ - sout_instance_t *p_sout = libvlc_priv (p_playlist->p_libvlc)->p_sout; + sout_instance_t *p_sout = pl_priv(p_playlist)->p_sout; if (p_sout) sout_DeleteInstance( p_sout ); #endif @@ -479,12 +541,25 @@ void playlist_LastLoop( playlist_t *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 ); @@ -493,35 +568,35 @@ void playlist_LastLoop( playlist_t *p_playlist ) } /** - * Preparse loop + * Preparse queue loop * - * Main loop for preparser queue - * \param p_obj items to preparse - * \return nothing + * @param p_obj preparse structure + * @return never */ -void playlist_PreparseLoop( playlist_preparse_t *p_obj ) +void *playlist_PreparseLoop( void *data ) { - playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; - input_item_t *p_current; - int i_activity; - - vlc_object_lock( p_obj ); + playlist_preparse_t *p_preparse = data; + playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_preparse) + - offsetof(playlist_private_t, preparse)))->public_data; - while( vlc_object_alive( p_obj ) ) + for( ;; ) { - if( p_obj->i_waiting == 0 ) - { - vlc_object_wait( p_obj ); - continue; - } + input_item_t *p_current; - p_current = p_obj->pp_waiting[0]; - REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 ); - vlc_object_unlock( p_obj ); + 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( ); - PL_LOCK; if( p_current ) { + int canc = vlc_savecancel (); + PL_LOCK; if( p_current->i_type == ITEM_TYPE_FILE ) { stats_TimerStart( p_playlist, "Preparse run", @@ -546,16 +621,16 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) */ char *psz_arturl = input_item_GetArtURL( p_current ); char *psz_name = input_item_GetName( p_current ); - if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL && - ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) ) + 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_object_lock( p_playlist->p_fetcher ); - INSERT_ELEM( p_playlist->p_fetcher->pp_waiting, - p_playlist->p_fetcher->i_waiting, - p_playlist->p_fetcher->i_waiting, p_current); - vlc_object_signal_unlocked( p_playlist->p_fetcher ); - vlc_object_unlock( p_playlist->p_fetcher ); + 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 { @@ -565,61 +640,61 @@ void playlist_PreparseLoop( playlist_preparse_t *p_obj ) } free( psz_name ); free( psz_arturl ); - PL_UNLOCK; + PL_UNLOCK; + vlc_restorecancel( canc ); } - else - PL_UNLOCK; - vlc_object_lock( p_obj ); - i_activity = var_GetInteger( p_playlist, "activity" ); + int 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 ); - vlc_object_lock( p_obj ); } - vlc_object_unlock( p_obj ); + + assert( 0 ); + return NULL; } /** * Fetcher loop * - * Main loop for secondary preparser queue - * \param p_obj items to preparse - * \return nothing + * \return never */ -void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) +void *playlist_FetcherLoop( void *data ) { - playlist_t *p_playlist = (playlist_t *)p_obj->p_parent; - input_item_t *p_item; - int i_activity; + playlist_fetcher_t *p_fetcher = data; + playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_fetcher) + - offsetof(playlist_private_t, fetcher)))->public_data; - vlc_object_lock( p_obj ); - - while( vlc_object_alive( p_obj ) ) + for( ;; ) { - if( p_obj->i_waiting == 0 ) - { - vlc_object_wait( p_obj ); - continue; - } + input_item_t *p_item; + + vlc_mutex_lock( &p_fetcher->lock ); + mutex_cleanup_push( &p_fetcher->lock ); - p_item = p_obj->pp_waiting[0]; - REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 ); - vlc_object_unlock( p_obj ); + 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) + /* 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 ... */ + * 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 ); + 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; @@ -651,15 +726,16 @@ void playlist_FetcherLoop( playlist_fetcher_t *p_obj ) } vlc_gc_decref( p_item ); } - vlc_object_lock( p_obj ); - i_activity = var_GetInteger( p_playlist, "activity" ); + vlc_restorecancel( canc ); + + int 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 ); - vlc_object_lock( p_obj ); } - vlc_object_unlock( p_obj ); + + assert( 0 ); + return NULL; } static void VariablesInit( playlist_t *p_playlist ) @@ -684,8 +760,6 @@ 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, "activity", VLC_VAR_INTEGER ); var_SetInteger( p_playlist, "activity", 0 ); @@ -698,3 +772,24 @@ static void VariablesInit( playlist_t *p_playlist ) var_AddCallback( p_playlist, "random", RandomCallback, NULL ); } + +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; +}