X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fthread.c;h=a87881c499301fde2ade3ff9406f8729ef52a51e;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=f7d8dde733411e4f2d27422cd487f806d719d202;hpb=52157ae334127f4a20b6b4557b09fc44b4a5ed1f;p=vlc diff --git a/src/playlist/thread.c b/src/playlist/thread.c index f7d8dde733..a87881c499 100644 --- a/src/playlist/thread.c +++ b/src/playlist/thread.c @@ -25,18 +25,21 @@ # include "config.h" #endif +#include + #include #include #include #include #include +#include #include "stream_output/stream_output.h" #include "playlist_internal.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static void *Thread ( vlc_object_t * ); +static void *Thread ( void * ); /***************************************************************************** * Main functions for the global thread @@ -55,19 +58,9 @@ void playlist_Activate( playlist_t *p_playlist ) /* */ playlist_private_t *p_sys = pl_priv(p_playlist); - /* Fetcher */ - p_sys->p_fetcher = playlist_fetcher_New( p_playlist ); - if( !p_sys->p_fetcher ) - msg_Err( p_playlist, "cannot create playlist fetcher" ); - - /* Preparse */ - p_sys->p_preparser = playlist_preparser_New( p_playlist, p_sys->p_fetcher ); - if( !p_sys->p_preparser ) - msg_Err( p_playlist, "cannot create playlist preparser" ); - /* Start the playlist thread */ - if( vlc_thread_create( p_playlist, "playlist", Thread, - VLC_THREAD_PRIORITY_LOW, false ) ) + if( vlc_clone( &p_sys->thread, Thread, p_playlist, + VLC_THREAD_PRIORITY_LOW ) ) { msg_Err( p_playlist, "cannot spawn playlist thread" ); } @@ -81,30 +74,24 @@ void playlist_Deactivate( playlist_t *p_playlist ) msg_Dbg( p_playlist, "Deactivate" ); - vlc_object_kill( p_playlist ); - vlc_thread_join( p_playlist ); - assert( !p_sys->p_input ); - PL_LOCK; - playlist_preparser_t *p_preparser = p_sys->p_preparser; - playlist_fetcher_t *p_fetcher = p_sys->p_fetcher; - - p_sys->p_preparser = NULL; - p_sys->p_fetcher = NULL; + vlc_object_kill( p_playlist ); + vlc_cond_signal( &p_sys->signal ); PL_UNLOCK; - if( p_preparser ) - playlist_preparser_Delete( p_preparser ); - if( p_fetcher ) - playlist_fetcher_Delete( p_fetcher ); + vlc_join( p_sys->thread, NULL ); + assert( !p_sys->p_input ); - /* close the remaining sout-keep */ - if( p_sys->p_sout ) - sout_DeleteInstance( p_sys->p_sout ); - p_sys->p_sout = NULL; + /* release input resources */ + if( p_sys->p_input_resource ) + { + input_resource_Terminate( p_sys->p_input_resource ); + input_resource_Release( p_sys->p_input_resource ); + } + p_sys->p_input_resource = NULL; - /* */ - playlist_MLDump( p_playlist ); + if( var_InheritBool( p_playlist, "media-library" ) ) + playlist_MLDump( p_playlist ); PL_LOCK; @@ -114,22 +101,6 @@ void playlist_Deactivate( playlist_t *p_playlist ) /* 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, 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 ); - - ARRAY_RESET( p_playlist->items ); - ARRAY_RESET( p_playlist->current ); - PL_UNLOCK; msg_Dbg( p_playlist, "Deactivated" ); @@ -150,7 +121,8 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd, PL_LOCK; - vlc_object_signal_unlocked( p_playlist ); + /* XXX: signaling while not changing any parameter... suspicious... */ + vlc_cond_signal( &pl_priv(p_playlist)->signal ); PL_UNLOCK; return VLC_SUCCESS; @@ -218,13 +190,12 @@ static void ResetCurrentlyPlaying( playlist_t *p_playlist, PL_DEBUG("rebuild done - %i items, index %i", p_playlist->current.i_size, p_playlist->i_current_index); - if( var_GetBool( p_playlist, "random" ) ) + if( var_GetBool( p_playlist, "random" ) && ( p_playlist->current.i_size > 0 ) ) { /* Shuffle the array */ - srand( (unsigned int)mdate() ); - for( int j = p_playlist->current.i_size - 1; j > 0; j-- ) + for( unsigned j = p_playlist->current.i_size - 1; j > 0; j-- ) { - int i = rand() % (j+1); /* between 0 and j */ + unsigned i = vlc_lrand48() % (j+1); /* between 0 and j */ playlist_item_t *p_tmp; /* swap the two items */ p_tmp = ARRAY_VAL(p_playlist->current, i); @@ -262,17 +233,22 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) assert( p_sys->p_input == NULL ); - input_thread_t *p_input_thread = - input_CreateThreadExtended( p_playlist, p_input, NULL, p_sys->p_sout ); - + if( !p_sys->p_input_resource ) + p_sys->p_input_resource = input_resource_New( VLC_OBJECT( p_playlist ) ); + input_thread_t *p_input_thread = input_Create( p_playlist, p_input, NULL, p_sys->p_input_resource ); if( p_input_thread ) { p_sys->p_input = p_input_thread; - var_AddCallback( p_input_thread, "intf-event", InputEvent, p_playlist ); - } - p_sys->p_sout = NULL; + var_SetAddress( p_playlist, "input-current", p_input_thread ); + + if( input_Start( p_sys->p_input ) ) + { + vlc_object_release( p_input_thread ); + p_sys->p_input = p_input_thread = NULL; + } + } char *psz_uri = input_item_GetURI( p_item->p_input ); if( psz_uri && ( !strncmp( psz_uri, "directory:", 10 ) || @@ -298,14 +274,14 @@ static int PlayItem( playlist_t *p_playlist, playlist_item_t *p_item ) if( !b_has_art || strncmp( psz_arturl, "attachment://", 13 ) ) { PL_DEBUG( "requesting art for %s", psz_name ); - playlist_AskForArtEnqueue( p_playlist, p_input, pl_Locked ); + playlist_AskForArtEnqueue( p_playlist, p_input ); } free( psz_arturl ); free( psz_name ); } - + /* FIXME: this is not safe !!*/ PL_UNLOCK; - var_SetInteger( p_playlist, "playlist-current", p_input->i_id ); + var_SetAddress( p_playlist, "item-current", p_input ); PL_LOCK; return VLC_SUCCESS; @@ -484,7 +460,7 @@ static int LoopInput( playlist_t *p_playlist ) if( ( p_sys->request.b_request || !vlc_object_alive( p_playlist ) ) && !p_input->b_die ) { PL_DEBUG( "incoming request - stopping current input" ); - input_StopThread( p_input ); + input_Stop( p_input, true ); } /* This input is dead. Remove it ! */ @@ -492,14 +468,16 @@ static int LoopInput( playlist_t *p_playlist ) { PL_DEBUG( "dead input" ); - assert( p_sys->p_sout == NULL ); - if( var_CreateGetBool( p_input, "sout-keep" ) ) - p_sys->p_sout = input_DetachSout( p_input ); - - /* The DelCallback must be issued without playlist lock - * It is not a problem as we return VLC_EGENERIC */ PL_UNLOCK; + /* We can unlock as we return VLC_EGENERIC (no event will be lost) */ + + /* input_resource_t must be manipulated without playlist lock */ + if( !var_CreateGetBool( p_input, "sout-keep" ) ) + input_resource_TerminateSout( p_sys->p_input_resource ); + + /* The DelCallback must be issued without playlist lock */ var_DelCallback( p_input, "intf-event", InputEvent, p_playlist ); + PL_LOCK; p_sys->p_input = NULL; @@ -519,7 +497,7 @@ static int LoopInput( playlist_t *p_playlist ) else if( p_input->b_error || p_input->b_eof ) { PL_DEBUG( "finished input" ); - input_StopThread( p_input ); + input_Stop( p_input, false ); } return VLC_SUCCESS; } @@ -538,12 +516,27 @@ static void LoopRequest( playlist_t *p_playlist ) const int i_status = p_sys->request.b_request ? p_sys->request.i_status : p_sys->status.i_status; - if( i_status == PLAYLIST_STOPPED ) + if( i_status == PLAYLIST_STOPPED || !vlc_object_alive( p_playlist ) ) { p_sys->status.i_status = PLAYLIST_STOPPED; - if( vlc_object_alive( p_playlist ) ) - vlc_object_wait( p_playlist ); + if( p_sys->p_input_resource && + input_resource_HasVout( p_sys->p_input_resource ) ) + { + /* XXX We can unlock if we don't issue the wait as we will be + * call again without anything else done between the calls */ + PL_UNLOCK; + + /* input_resource_t must be manipulated without playlist lock */ + input_resource_TerminateVout( p_sys->p_input_resource ); + + PL_LOCK; + } + else + { + if( vlc_object_alive( p_playlist ) ) + vlc_cond_wait( &p_sys->signal, &p_sys->lock ); + } return; } @@ -561,20 +554,19 @@ static void LoopRequest( playlist_t *p_playlist ) if( var_GetBool( p_playlist, "play-and-exit" ) ) { msg_Info( p_playlist, "end of playlist, exiting" ); - vlc_object_kill( p_playlist->p_libvlc ); + libvlc_Quit( p_playlist->p_libvlc ); } } /** * Run the main control thread itself */ -static void *Thread ( vlc_object_t *p_this ) +static void *Thread ( void *data ) { - playlist_t *p_playlist = (playlist_t*)p_this; + playlist_t *p_playlist = data; playlist_private_t *p_sys = pl_priv(p_playlist); - int canc = vlc_savecancel(); - vlc_object_lock( p_playlist ); + playlist_Lock( p_playlist ); while( vlc_object_alive( p_playlist ) || p_sys->p_input ) { /* FIXME: what's that ! */ @@ -588,13 +580,12 @@ static void *Thread ( vlc_object_t *p_this ) /* If there is an input, check that it doesn't need to die. */ while( !LoopInput( p_playlist ) ) - vlc_object_wait( p_playlist ); + vlc_cond_wait( &p_sys->signal, &p_sys->lock ); LoopRequest( p_playlist ); } - vlc_object_unlock( p_playlist ); + playlist_Unlock( p_playlist ); - vlc_restorecancel (canc); return NULL; }