# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
+#include <vlc_rand.h>
#include "stream_output/stream_output.h"
#include "playlist_internal.h"
/* */
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 ) )
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;
-
- 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 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;
- /* 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;
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);
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 ) ||
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;
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 ! */
{
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 );
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;
}
{
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;
}
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 );
}
}
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 ! */
/* 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;
}
projects / vlc / blobdiff