/*****************************************************************************
* 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 <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
# include "config.h"
#endif
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#include <assert.h>
+#include <vlc_common.h>
#include <vlc_sout.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
*****************************************************************************/
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 )
static const char playlist_name[] = "playlist";
playlist_t *p_playlist;
bool b_save;
- int i_tree;
/* Allocate structure */
p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ),
- VLC_OBJECT_PLAYLIST, playlist_name );
+ VLC_OBJECT_GENERIC, playlist_name );
if( !p_playlist )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
TAB_INIT( p_playlist->i_sds, 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 );
+ vlc_mutex_init( &p_playlist->gc_lock );
p_playlist->i_last_playlist_id = 0;
p_playlist->p_input = NULL;
p_playlist->b_reset_currently_playing = true;
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);
+ p_playlist->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
p_playlist->b_doing_ml = false;
* \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;
- // Kill preparser
if( p_playlist->p_preparse )
{
vlc_object_release( p_playlist->p_preparse );
}
- // Kill meta fetcher
if( p_playlist->p_fetcher )
{
vlc_object_release( p_playlist->p_fetcher );
}
+ 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 )
}
vlc_mutex_lock( &p_playlist->gc_lock );
- while( ( p_obj = vlc_object_find( p_playlist->p_libvlc, VLC_OBJECT_VOUT,
- FIND_CHILD ) ) )
- {
- 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 );
- }
- while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_SOUT,
- FIND_CHILD ) ) )
- {
- 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 );
- }
p_playlist->b_cant_sleep = false;
vlc_mutex_unlock( &p_playlist->gc_lock );
}
+/* Input Callback */
+static void input_state_changed( const vlc_event_t * event, void * data )
+{
+ (void)event;
+ playlist_t * p_playlist = data;
+ playlist_Signal( p_playlist );
+}
+
+/* Input Callback */
+static void input_selected_stream_changed( const vlc_event_t * event, void * data )
+{
+ (void)event;
+ playlist_t * p_playlist = data;
+ PL_LOCK;
+ p_playlist->gc_date = mdate();
+ vlc_object_signal_unlocked( p_playlist );
+ PL_UNLOCK;
+}
+
+/* Internals */
+void playlist_release_current_input( playlist_t * p_playlist )
+{
+ vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
+
+ if( !p_playlist->p_input ) return;
+
+ input_thread_t * p_input = 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;
+
+ /* Release the playlist lock, because we may get stuck
+ * in vlc_object_release() for some time. */
+ PL_UNLOCK;
+ vlc_object_release( p_input );
+ PL_LOCK;
+}
+
+void playlist_set_current_input(
+ playlist_t * p_playlist, input_thread_t * p_input )
+{
+ vlc_assert_locked( &(vlc_internals(p_playlist)->lock) );
+
+ playlist_release_current_input( p_playlist );
+
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ 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 );
+ vlc_event_attach( p_em, vlc_InputSelectedStreamChanged,
+ input_selected_stream_changed, p_playlist );
+ }
+}
+
+/** Get current playing input.
+ */
+input_thread_t * playlist_CurrentInput( playlist_t * p_playlist )
+{
+ input_thread_t * p_input;
+ PL_LOCK;
+ p_input = p_playlist->p_input;
+ if( p_input ) vlc_object_yield( p_input );
+ PL_UNLOCK;
+ return p_input;
+}
+
+
+/**
+ * @}
+ */
+
/**
* Main loop
*
{
int i_activity;
input_thread_t *p_input;
+ sout_instance_t **pp_sout =
+ &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+
PL_DEBUG( "dead input" );
p_input = p_playlist->p_input;
- p_playlist->p_input = NULL;
- /* 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 );
-
- PL_LOCK;
+ playlist_release_current_input( p_playlist );
p_playlist->gc_date = mdate();
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 */
* - Request, running requested -> start new item
* - Request, stopped requested -> collect garbage
*/
- if( p_playlist->request.i_status != PLAYLIST_STOPPED )
+ int i_status = p_playlist->request.b_request ?
+ p_playlist->request.i_status : p_playlist->status.i_status;
+ if( i_status != PLAYLIST_STOPPED )
{
msg_Dbg( p_playlist, "starting new item" );
p_item = playlist_NextItem( p_playlist );
*/
void playlist_LastLoop( playlist_t *p_playlist )
{
- vlc_object_t *p_obj;
-
/* If there is an input, kill it */
while( 1 )
{
if( 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 )
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 );
- }
+#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;
+ if (p_sout)
+ sout_DeleteInstance( p_sout );
+#endif
- /* close all remaining vout */
- while( ( p_obj = vlc_object_find( p_playlist,
- VLC_OBJECT_VOUT, FIND_CHILD ) ) )
+ if( p_playlist->status.p_node &&
+ p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG )
{
- vlc_object_detach( p_obj );
- vlc_object_release( p_obj );
- vout_Destroy( (vout_thread_t *)p_obj );
+ PL_DEBUG( "%s was marked for deletion, deleting",
+ PLI_NAME( p_playlist->status.p_node ) );
+ playlist_ItemDelete( p_playlist->status.p_node );
+ p_playlist->status.p_node = NULL;
}
-
- while( p_playlist->i_sds )
+ if( p_playlist->status.p_item &&
+ p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG )
{
- playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->pp_sds[0]->p_sd->psz_module );
+ PL_DEBUG( "%s was marked for deletion, deleting",
+ PLI_NAME( p_playlist->status.p_item ) );
+ playlist_ItemDelete( p_playlist->status.p_item );
+ p_playlist->status.p_item = NULL;
}
+ /* Core should have terminated all SDs before the playlist */
+ /* TODO: It fails to do so when not playing anything -- Courmisch */
+ playlist_ServicesDiscoveryKillAll( p_playlist );
playlist_MLDump( p_playlist );
+ vlc_object_kill( p_playlist->p_preparse );
+ vlc_thread_join( p_playlist->p_preparse );
+ vlc_object_kill( p_playlist->p_fetcher );
+ vlc_thread_join( p_playlist->p_fetcher );
+
PL_LOCK;
FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->all_items )
free( p_del->pp_children );
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( vlc_object_alive( p_obj ) )
{
- vlc_object_lock( p_obj );
- while( p_obj->i_waiting == 0 )
+ if( p_obj->i_waiting == 0 )
{
- if( vlc_object_wait( p_obj ) || p_playlist->b_die )
- {
- vlc_object_unlock( p_obj );
- return;
- }
+ vlc_object_wait( p_obj );
+ continue;
}
p_current = p_obj->pp_waiting[0];
*/
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 &&
+ 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,
+ INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
p_playlist->p_fetcher->i_waiting,
- p_playlist->p_fetcher->i_waiting, p);
+ p_playlist->p_fetcher->i_waiting, p_current);
vlc_object_signal_unlocked( p_playlist->p_fetcher );
vlc_object_unlock( p_playlist->p_fetcher );
}
vlc_object_unlock( p_obj );
/* Sleep at least 1ms */
msleep( (i_activity+1) * 1000 );
+ vlc_object_lock( p_obj );
}
+
+ for( int i = 0; i < p_obj->i_waiting; i++ )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[i] );
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ }
+
+ vlc_object_unlock( p_obj );
}
/**
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_object_lock( p_obj );
+
+ while( vlc_object_alive( p_obj ) )
{
- vlc_mutex_lock( &p_obj->object_lock );
- while( p_obj->i_waiting == 0 )
+ if( 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;
- }
+ vlc_object_wait( p_obj );
+ continue;
}
- 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 );
+ p_item = p_obj->pp_waiting[0];
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ vlc_object_unlock( p_obj );
if( p_item )
{
- if( !b_fetch_art )
+ 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++ )
{
- /* 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 );
- }
+ 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 );
+ }
- /* 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;
+ 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
- vlc_gc_decref( p_item );
+ }
+ 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
{
- 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 );
- }
+ 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" );
vlc_object_unlock( p_obj );
/* Sleep at least 1ms */
msleep( (i_activity+1) * 1000 );
+ vlc_object_lock( p_obj );
}
+
+ for( int i = 0; i < p_obj->i_waiting; i++ )
+ {
+ vlc_gc_decref( p_obj->pp_waiting[i] );
+ REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
+ }
+
+ vlc_object_unlock( p_obj );
}
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 );