X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fthread.c;h=0ed215e7e7205cd4ee4a90b9a2b20e4b580c3db8;hb=c35e504a57cead20266b1c37b137a3ad98c3d1cd;hp=3005793f3960b7c4e3c7734774a5165492fa233b;hpb=982f3e4204f48c955549c075d8f416f3192ed0d0;p=vlc diff --git a/src/playlist/thread.c b/src/playlist/thread.c index 3005793f39..0ed215e7e7 100644 --- a/src/playlist/thread.c +++ b/src/playlist/thread.c @@ -25,11 +25,14 @@ # include "config.h" #endif +#include + #include #include #include #include #include +#include #include "stream_output/stream_output.h" #include "playlist_internal.h" @@ -55,16 +58,6 @@ 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_clone( &p_sys->thread, Thread, p_playlist, VLC_THREAD_PRIORITY_LOW ) ) @@ -81,34 +74,21 @@ void playlist_Deactivate( playlist_t *p_playlist ) msg_Dbg( p_playlist, "Deactivate" ); - vlc_object_kill( p_playlist ); PL_LOCK; + vlc_object_kill( p_playlist ); vlc_cond_signal( &p_sys->signal ); PL_UNLOCK; vlc_join( p_sys->thread, NULL ); 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; + /* release input resources */ + if( p_sys->p_input_resource ) + input_resource_Delete( p_sys->p_input_resource ); + p_sys->p_input_resource = NULL; - p_sys->p_preparser = NULL; - p_sys->p_fetcher = NULL; - PL_UNLOCK; - - if( p_preparser ) - playlist_preparser_Delete( p_preparser ); - if( p_fetcher ) - playlist_fetcher_Delete( p_fetcher ); - - /* release input ressources */ - if( p_sys->p_input_ressource ) - input_ressource_Delete( p_sys->p_input_ressource ); - p_sys->p_input_ressource = NULL; - - /* */ - playlist_MLDump( p_playlist ); + if( var_InheritBool( p_playlist, "media-library" ) ) + playlist_MLDump( p_playlist ); PL_LOCK; @@ -207,13 +187,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 = ((unsigned)vlc_mrand48()) % (j+1); /* between 0 and j */ playlist_item_t *p_tmp; /* swap the two items */ p_tmp = ARRAY_VAL(p_playlist->current, i); @@ -251,17 +230,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_input_ressource ); - + 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_input_ressource = 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 ) || @@ -287,14 +271,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; @@ -473,7 +457,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 ! */ @@ -481,16 +465,12 @@ static int LoopInput( playlist_t *p_playlist ) { PL_DEBUG( "dead input" ); - assert( p_sys->p_input_ressource == NULL ); - - p_sys->p_input_ressource = input_DetachRessource( p_input ); - PL_UNLOCK; /* We can unlock as we return VLC_EGENERIC (no event will be lost) */ - /* input_ressource_t must be manipulated without playlist lock */ + /* input_resource_t must be manipulated without playlist lock */ if( !var_CreateGetBool( p_input, "sout-keep" ) ) - input_ressource_TerminateSout( p_sys->p_input_ressource ); + 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 ); @@ -514,7 +494,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; } @@ -537,23 +517,22 @@ static void LoopRequest( playlist_t *p_playlist ) { p_sys->status.i_status = PLAYLIST_STOPPED; - if( p_sys->p_input_ressource && - input_ressource_HasVout( p_sys->p_input_ressource ) ) + 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_ressource_t must be manipulated without playlist lock */ - input_ressource_TerminateVout( p_sys->p_input_ressource ); + /* 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( &pl_priv(p_playlist)->signal, - &vlc_internals(p_playlist)->lock ); + vlc_cond_wait( &p_sys->signal, &p_sys->lock ); } return; } @@ -572,7 +551,7 @@ 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 ); } } @@ -584,7 +563,7 @@ static void *Thread ( void *data ) playlist_t *p_playlist = data; playlist_private_t *p_sys = pl_priv(p_playlist); - vlc_object_lock( p_playlist ); + playlist_Lock( p_playlist ); while( vlc_object_alive( p_playlist ) || p_sys->p_input ) { /* FIXME: what's that ! */ @@ -598,12 +577,11 @@ static void *Thread ( void *data ) /* If there is an input, check that it doesn't need to die. */ while( !LoopInput( p_playlist ) ) - vlc_cond_wait( &pl_priv(p_playlist)->signal, - &vlc_internals(p_playlist)->lock ); + vlc_cond_wait( &p_sys->signal, &p_sys->lock ); LoopRequest( p_playlist ); } - vlc_object_unlock( p_playlist ); + playlist_Unlock( p_playlist ); return NULL; }