/*****************************************************************************
* engine.c : Run the playlist and handle its control
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
- * $Id$
+ * Copyright (C) 1999-2008 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/sout.h>
-#include <vlc/input.h>
-#include "vlc_playlist.h"
-#include "vlc_interaction.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <assert.h>
+#include <vlc_common.h>
+#include <vlc_sout.h>
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
#include "playlist_internal.h"
+#include "stream_output/stream_output.h" /* sout_DeleteInstance */
/*****************************************************************************
* Local prototypes
static int RandomCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *a )
{
- ((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE;
- playlist_Signal( ((playlist_t*)p_this) );
+ (void)psz_cmd; (void)oldval; (void)newval; (void)a;
+ playlist_t *p_playlist = (playlist_t*)p_this;
+
+ PL_LOCK;
+
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
+ vlc_cond_signal( &pl_priv(p_playlist)->signal );
+
+ PL_UNLOCK;
return VLC_SUCCESS;
}
*/
playlist_t * playlist_Create( vlc_object_t *p_parent )
{
+ static const char playlist_name[] = "playlist";
playlist_t *p_playlist;
- int i_tree;
+ playlist_private_t *p;
/* Allocate structure */
- p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST );
- if( !p_playlist )
- {
- msg_Err( p_parent, "out of memory" );
+ p = vlc_custom_create( p_parent, sizeof( *p ),
+ VLC_OBJECT_GENERIC, playlist_name );
+ if( !p )
return NULL;
- }
- p_parent->p_libvlc->p_playlist = p_playlist;
+
+ assert( offsetof( playlist_private_t, public_data ) == 0 );
+ p_playlist = &p->public_data;
+ vlc_object_attach( p_playlist, p_parent );
+ 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 );
+ vlc_mutex_init( &p->lock );
+ vlc_cond_init( &p->signal );
/* Initialise data structures */
- vlc_mutex_init( p_playlist, &p_playlist->gc_lock );
- p_playlist->i_last_playlist_id = 0;
- p_playlist->i_last_input_id = 0;
- p_playlist->p_input = NULL;
-
- p_playlist->gc_date = 0;
- p_playlist->b_cant_sleep = VLC_FALSE;
+ pl_priv(p_playlist)->i_last_playlist_id = 0;
+ pl_priv(p_playlist)->p_input = NULL;
ARRAY_INIT( p_playlist->items );
ARRAY_INIT( p_playlist->all_items );
- ARRAY_INIT( p_playlist->input_items );
+ ARRAY_INIT( pl_priv(p_playlist)->items_to_delete );
ARRAY_INIT( p_playlist->current );
p_playlist->i_current_index = 0;
- p_playlist->b_reset_currently_playing = VLC_TRUE;
- p_playlist->last_rebuild_date = 0;
+ pl_priv(p_playlist)->b_reset_currently_playing = true;
+ pl_priv(p_playlist)->last_rebuild_date = 0;
+
+ pl_priv(p_playlist)->b_tree = var_InheritBool( p_parent, "playlist-tree" );
- i_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
- p_playlist->b_always_tree = (i_tree == 1);
- p_playlist->b_never_tree = (i_tree == 2);
+ pl_priv(p_playlist)->b_doing_ml = false;
- p_playlist->b_doing_ml = VLC_FALSE;
+ pl_priv(p_playlist)->b_auto_preparse =
+ var_InheritBool( p_parent, "auto-preparse" );
- p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL);
- p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL);
+ /* Fetcher */
+ p->p_fetcher = playlist_fetcher_New( p_playlist );
+ if( unlikely(p->p_fetcher == NULL) )
+ {
+ msg_Err( p_playlist, "cannot create fetcher" );
+ p->p_preparser = NULL;
+ }
+ else
+ { /* Preparse */
+ p->p_preparser = playlist_preparser_New( p_playlist, p->p_fetcher );
+ if( unlikely(p->p_preparser == NULL) )
+ msg_Err( p_playlist, "cannot create preparser" );
+ }
+
+ /* Create the root node */
+ PL_LOCK;
+ p_playlist->p_root = playlist_NodeCreate( p_playlist, NULL, NULL,
+ 0, NULL );
+ PL_UNLOCK;
+ if( !p_playlist->p_root ) return NULL;
+
+ /* Create currently playing items node */
+ PL_LOCK;
+ p_playlist->p_playing = playlist_NodeCreate(
+ p_playlist, _( "Playlist" ), p_playlist->p_root,
+ PLAYLIST_RO_FLAG, NULL );
- /* Create playlist and media library */
- p_playlist->p_local_category = playlist_NodeCreate( p_playlist,
- _( "Playlist" ),p_playlist->p_root_category );
- p_playlist->p_local_onelevel = playlist_NodeCreate( p_playlist,
- _( "Playlist" ), p_playlist->p_root_onelevel );
- p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
- p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
+ PL_UNLOCK;
- /* Link the nodes together. Todo: actually create them from the same input*/
- p_playlist->p_local_onelevel->p_input->i_id =
- p_playlist->p_local_category->p_input->i_id;
+ if( !p_playlist->p_playing ) return NULL;
- if( config_GetInt( p_playlist, "media-library") )
+ /* Create media library node */
+ const bool b_ml = var_InheritBool( p_parent, "media-library");
+ if( b_ml )
{
- p_playlist->p_ml_category = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_category );
- p_playlist->p_ml_onelevel = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_onelevel );
- p_playlist->p_ml_category->i_flags |= PLAYLIST_RO_FLAG;
- p_playlist->p_ml_onelevel->i_flags |= PLAYLIST_RO_FLAG;
- p_playlist->p_ml_onelevel->p_input->i_id =
- p_playlist->p_ml_category->p_input->i_id;
+ PL_LOCK;
+ p_playlist->p_media_library = playlist_NodeCreate(
+ p_playlist, _( "Media Library" ), p_playlist->p_root,
+ PLAYLIST_RO_FLAG, NULL );
+ PL_UNLOCK;
+ if(!p_playlist->p_media_library ) return NULL;
}
else
{
- p_playlist->p_ml_category = p_playlist->p_ml_onelevel = NULL;
+ p_playlist->p_media_library = NULL;
}
- /* Initial status */
- p_playlist->status.p_item = NULL;
- p_playlist->status.p_node = p_playlist->p_local_onelevel;
- p_playlist->request.b_request = VLC_FALSE;
- p_playlist->status.i_status = PLAYLIST_STOPPED;
+ p_playlist->p_root_category = p_playlist->p_root;
+ p_playlist->p_root_onelevel = p_playlist->p_root;
+ p_playlist->p_local_category = p_playlist->p_playing;
+ p_playlist->p_local_onelevel = p_playlist->p_playing;
+ p_playlist->p_ml_category = p_playlist->p_media_library;
+ p_playlist->p_ml_onelevel = p_playlist->p_media_library;;
- p_playlist->i_sort = SORT_ID;
- p_playlist->i_order = ORDER_NORMAL;
+ /* Initial status */
+ pl_priv(p_playlist)->status.p_item = NULL;
+ pl_priv(p_playlist)->status.p_node = p_playlist->p_playing;
+ pl_priv(p_playlist)->request.b_request = false;
+ pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED;
- vlc_object_attach( p_playlist, p_parent );
+ if(b_ml)
+ {
+ const bool b_auto_preparse = pl_priv(p_playlist)->b_auto_preparse;
+ pl_priv(p_playlist)->b_auto_preparse = false;
+ playlist_MLLoad( p_playlist );
+ pl_priv(p_playlist)->b_auto_preparse = b_auto_preparse;
+ }
- playlist_MLLoad( p_playlist );
return p_playlist;
}
+/**
+ * Destroy playlist.
+ * This is not thread-safe. Any reference to the playlist is assumed gone.
+ * (In particular, all interface and services threads must have been joined).
+ *
+ * \param p_playlist the playlist object
+ */
void playlist_Destroy( playlist_t *p_playlist )
{
- while( p_playlist->i_sds )
- {
- playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->pp_sds[0]->psz_module );
- }
+ playlist_private_t *p_sys = pl_priv(p_playlist);
- playlist_MLDump( p_playlist );
+ msg_Dbg( p_playlist, "destroying" );
+ if( p_sys->p_preparser )
+ playlist_preparser_Delete( p_sys->p_preparser );
+ if( p_sys->p_fetcher )
+ playlist_fetcher_Delete( p_sys->p_fetcher );
- vlc_thread_join( p_playlist->p_preparse );
- vlc_thread_join( p_playlist->p_secondary_preparse );
- vlc_thread_join( p_playlist );
+ /* Already cleared when deactivating (if activated anyway) */
+ assert( !p_sys->p_input );
+ assert( !p_sys->p_input_resource );
- vlc_object_detach( p_playlist->p_preparse );
- vlc_object_detach( p_playlist->p_secondary_preparse );
+ vlc_cond_destroy( &p_sys->signal );
+ vlc_mutex_destroy( &p_sys->lock );
- var_Destroy( p_playlist, "intf-change" );
- var_Destroy( p_playlist, "item-change" );
- var_Destroy( p_playlist, "playlist-current" );
- var_Destroy( p_playlist, "intf-popmenu" );
- 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" );
-
- PL_LOCK;
- /* Go through all items, and simply free everything without caring
- * about the tree structure. Do not decref, it will be done by doing
- * the same thing on the input items array */
+ /* Remove all remaining items */
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( input_item_t *p_del, p_playlist->input_items )
- input_ItemClean( p_del );
+ 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_playlist->input_items );
+ ARRAY_RESET( p_sys->items_to_delete );
ARRAY_RESET( p_playlist->items );
ARRAY_RESET( p_playlist->current );
- PL_UNLOCK;
-
- if( p_playlist->p_stats )
- free( p_playlist->p_stats );
-
- vlc_mutex_destroy( &p_playlist->gc_lock );
- vlc_object_destroy( p_playlist->p_preparse );
- vlc_object_destroy( p_playlist->p_secondary_preparse );
- vlc_object_detach( p_playlist );
- vlc_object_destroy( p_playlist );
-
+ vlc_object_release( p_playlist );
}
-/* Destroy remaining objects */
-static void ObjectGarbageCollector( playlist_t *p_playlist )
+/** Get current playing input.
+ */
+input_thread_t * playlist_CurrentInput( playlist_t * p_playlist )
{
- vlc_object_t *p_obj;
-
- if( mdate() - p_playlist->gc_date < 1000000 )
- {
- p_playlist->b_cant_sleep = VLC_TRUE;
- return;
- }
- else if( p_playlist->gc_date == 0 )
- return;
-
- vlc_mutex_lock( &p_playlist->gc_lock );
- while( ( p_obj = vlc_object_find( p_playlist, VLC_OBJECT_VOUT,
- FIND_CHILD ) ) )
- {
- if( p_obj->p_parent != (vlc_object_t*)p_playlist )
- {
- 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_t*)p_playlist )
- {
- vlc_object_release( p_obj );
- break;
- }
- vlc_object_release( p_obj );
- sout_DeleteInstance( (sout_instance_t*)p_obj );
- }
- p_playlist->b_cant_sleep = VLC_FALSE;
- vlc_mutex_unlock( &p_playlist->gc_lock );
+ 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;
}
-/** Main loop for the playlist */
-void playlist_MainLoop( playlist_t *p_playlist )
-{
- playlist_item_t *p_item = NULL;
- vlc_bool_t b_playexit = var_GetBool( p_playlist, "play-and-exit" );
- PL_LOCK;
+/**
+ * @}
+ */
- 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 );
- p_playlist->last_rebuild_date = mdate();
- }
+/** Accessor for status item and status nodes.
+ */
+playlist_item_t * get_current_status_item( playlist_t * p_playlist )
+{
+ PL_ASSERT_LOCKED;
-check_input:
- /* If there is an input, check that it doesn't need to die. */
- if( p_playlist->p_input )
- {
- if( p_playlist->request.b_request && !p_playlist->p_input->b_die )
- {
- PL_DEBUG( "incoming request - stopping current input" );
- input_StopThread( p_playlist->p_input );
- }
-
- /* This input is dead. Remove it ! */
- if( p_playlist->p_input->b_dead )
- {
- int i_activity;
- input_thread_t *p_input;
- 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 input_DestroyThread() for some time. */
- PL_UNLOCK
-
- /* Destroy input */
- input_DestroyThread( p_input );
-
- /* Unlink current input
- * (_after_ input_DestroyThread for vout garbage collector) */
- vlc_object_detach( p_input );
-
- /* Destroy object */
- vlc_object_destroy( p_input );
-
- PL_LOCK;
-
- p_playlist->gc_date = mdate();
- p_playlist->b_cant_sleep = VLC_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 );
- goto check_input;
- }
- /* This input is dying, let it do */
- else if( p_playlist->p_input->b_die )
- {
- PL_DEBUG( "dying input" );
- msleep( 25000 ); // 25 ms
- 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 )
- {
- PL_DEBUG( "finished input" );
- input_StopThread( 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 )
- {
- PL_UNLOCK;
- ObjectGarbageCollector( p_playlist );
- PL_LOCK;
- }
- }
- else
- {
- /* No input. Several cases
- * - No request, running status -> start new item
- * - No request, stopped status -> collect garbage
- * - Request, running requested -> start new item
- * - Request, stopped requested -> collect garbage
- */
- if( (!p_playlist->request.b_request &&
- p_playlist->status.i_status != PLAYLIST_STOPPED) ||
- ( p_playlist->request.b_request &&
- p_playlist->request.i_status != PLAYLIST_STOPPED ) )
- {
- msg_Dbg( p_playlist, "starting new item" );
- p_item = playlist_NextItem( p_playlist );
-
- if( p_item == NULL )
- {
- msg_Dbg( p_playlist, "nothing to play" );
- if( b_playexit == VLC_TRUE )
- {
- msg_Info( p_playlist, "end of playlist, exiting" );
- p_playlist->p_libvlc->b_die = VLC_TRUE;
- }
- p_playlist->status.i_status = PLAYLIST_STOPPED;
- PL_UNLOCK
- return;
- }
- playlist_PlayItem( p_playlist, p_item );
- }
- else
- {
- 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;
- }
-
- /* Collect garbage */
- PL_UNLOCK;
- ObjectGarbageCollector( p_playlist );
- PL_LOCK;
- }
- }
- PL_UNLOCK
+ return pl_priv(p_playlist)->status.p_item;
}
-/** Playlist dying last loop */
-void playlist_LastLoop( playlist_t *p_playlist )
+playlist_item_t * get_current_status_node( playlist_t * p_playlist )
{
- vlc_object_t *p_obj;
+ PL_ASSERT_LOCKED;
- /* If there is an input, kill it */
- while( 1 )
- {
- PL_LOCK
-
- if( p_playlist->p_input == NULL )
- {
- PL_UNLOCK
- break;
- }
-
- if( p_playlist->p_input->b_dead )
- {
- input_thread_t *p_input;
-
- /* Unlink current input */
- p_input = p_playlist->p_input;
- p_playlist->p_input = NULL;
- PL_UNLOCK
-
- /* Destroy input */
- input_DestroyThread( p_input );
- /* Unlink current input (_after_ input_DestroyThread for vout
- * garbage collector)*/
- vlc_object_detach( p_input );
-
- /* Destroy object */
- vlc_object_destroy( p_input );
- continue;
- }
- else if( 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 )
- {
- input_StopThread( p_playlist->p_input );
- PL_UNLOCK
- continue;
- }
- else
- {
- p_playlist->p_input->b_eof = 1;
- }
-
- PL_UNLOCK
-
- msleep( INTF_IDLE_SLEEP );
- }
+ return pl_priv(p_playlist)->status.p_node;
+}
- /* close all remaining sout */
- while( ( p_obj = vlc_object_find( p_playlist,
- VLC_OBJECT_SOUT, FIND_CHILD ) ) )
- {
- vlc_object_release( p_obj );
- sout_DeleteInstance( (sout_instance_t*)p_obj );
- }
+void set_current_status_item( playlist_t * p_playlist,
+ playlist_item_t * p_item )
+{
+ PL_ASSERT_LOCKED;
- /* close all remaining vout */
- while( ( p_obj = vlc_object_find( p_playlist,
- VLC_OBJECT_VOUT, FIND_CHILD ) ) )
+ 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 )
{
- vlc_object_detach( p_obj );
- vlc_object_release( p_obj );
- vout_Destroy( (vout_thread_t *)p_obj );
+ /* 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;
}
-/** Main loop for preparser queue */
-void playlist_PreparseLoop( playlist_preparse_t *p_obj )
+void set_current_status_node( playlist_t * p_playlist,
+ playlist_item_t * p_node )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
- input_item_t *p_current;
- int i_activity;
- uint32_t i_m, i_o;
+ PL_ASSERT_LOCKED;
- while( !p_playlist->b_die )
+ 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 )
{
- vlc_mutex_lock( &p_obj->object_lock );
- while( 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;
- }
- }
-
- p_current = p_obj->pp_waiting[0];
- REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
- vlc_mutex_unlock( &p_obj->object_lock );
-
- PL_LOCK;
- if( p_current )
- {
- vlc_bool_t b_preparsed = VLC_FALSE;
- if( strncmp( p_current->psz_uri, "http:", 5 ) &&
- strncmp( p_current->psz_uri, "rtsp:", 5 ) &&
- strncmp( p_current->psz_uri, "udp:", 4 ) &&
- strncmp( p_current->psz_uri, "mms:", 4 ) &&
- strncmp( p_current->psz_uri, "cdda:", 4 ) &&
- strncmp( p_current->psz_uri, "dvd:", 4 ) &&
- strncmp( p_current->psz_uri, "v4l:", 4 ) &&
- strncmp( p_current->psz_uri, "dshow:", 6 ) )
- {
- b_preparsed = VLC_TRUE;
- stats_TimerStart( p_playlist, "Preparse run",
- STATS_TIMER_PREPARSE );
- PL_UNLOCK;
- input_Preparse( p_playlist, p_current );
- PL_LOCK;
- stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE );
- }
- PL_UNLOCK;
- if( b_preparsed )
- {
- p_current->p_meta->i_status |= ITEM_PREPARSED;
- var_SetInteger( p_playlist, "item-change", p_current->i_id );
- }
- PL_LOCK;
-
- /* If we haven't retrieved enough meta, add to secondary queue
- * which will run the "meta fetchers"
- * TODO:
- * don't do this for things we won't get meta for, like
- * videos
- */
- if( !input_MetaSatisfied( p_playlist, p_current, &i_m, &i_o,
- VLC_TRUE ) )
- {
- preparse_item_t p;
- p.p_item = p_current;
- p.b_fetch_art = VLC_FALSE;
- vlc_mutex_lock( &p_playlist->p_secondary_preparse->object_lock);
- INSERT_ELEM( p_playlist->p_secondary_preparse->p_waiting,
- p_playlist->p_secondary_preparse->i_waiting,
- p_playlist->p_secondary_preparse->i_waiting,
- p );
- vlc_mutex_unlock(
- &p_playlist->p_secondary_preparse->object_lock);
- vlc_cond_signal(
- &p_playlist->p_secondary_preparse->object_wait );
- }
- else
- vlc_gc_decref( p_current );
- PL_UNLOCK;
- }
- else
- PL_UNLOCK;
-
- vlc_mutex_lock( &p_obj->object_lock );
- i_activity = var_GetInteger( p_playlist, "activity" );
- if( i_activity < 0 ) i_activity = 0;
- vlc_mutex_unlock( &p_obj->object_lock );
- /* Sleep at least 1ms */
- msleep( (i_activity+1) * 1000 );
+ /* 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 for secondary preparser queue */
-void playlist_SecondaryPreparseLoop( playlist_secondary_preparse_t *p_obj )
+static input_thread_t *playlist_FindInput( vlc_object_t *object )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
- vlc_bool_t b_fetch_art;
- input_item_t *p_item;
- int i_activity;
-
- while( !p_playlist->b_die )
- {
- vlc_mutex_lock( &p_obj->object_lock );
- while( 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;
- }
- }
-
- 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 );
- if( p_item )
- {
- if( !b_fetch_art )
- {
- input_MetaFetch( p_playlist, p_item );
- p_item->p_meta->i_status |= ITEM_META_FETCHED;
- var_SetInteger( p_playlist, "item-change", p_item->i_id );
- /* Fetch right now */
- if( var_GetInteger( p_playlist, "album-art" ) == ALBUM_ART_ALL )
- {
- vlc_mutex_lock( &p_obj->object_lock );
- preparse_item_t p;
- p.p_item = p_item;
- p.b_fetch_art = VLC_TRUE;
- INSERT_ELEM( p_playlist->p_secondary_preparse->p_waiting,
- p_playlist->p_secondary_preparse->i_waiting,
- 0, p );
- vlc_mutex_unlock( &p_obj->object_lock );
- }
- else
- vlc_gc_decref( p_item );
- }
- else
- {
- input_ArtFetch( p_playlist, p_item );
- p_item->p_meta->i_status |= ITEM_ART_FETCHED;
- vlc_gc_decref( p_item );
- }
- }
- vlc_mutex_lock( &p_obj->object_lock );
- i_activity = var_GetInteger( p_playlist, "activity" );
- if( i_activity < 0 ) i_activity = 0;
- vlc_mutex_unlock( &p_obj->object_lock );
- /* Sleep at least 1ms */
- msleep( (i_activity+1) * 1000 );
- }
+ assert( object == VLC_OBJECT(pl_Get(object)) );
+ return playlist_CurrentInput( (playlist_t *)object );
}
static void VariablesInit( playlist_t *p_playlist )
{
- vlc_value_t val;
/* These variables control updates */
var_Create( p_playlist, "intf-change", VLC_VAR_BOOL );
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-change", val );
+ var_SetBool( p_playlist, "intf-change", true );
- var_Create( p_playlist, "item-change", VLC_VAR_INTEGER );
- val.i_int = -1;
- var_Set( p_playlist, "item-change", val );
+ var_Create( p_playlist, "item-change", VLC_VAR_ADDRESS );
+ var_Create( p_playlist, "leaf-to-parent", VLC_VAR_ADDRESS );
- var_Create( p_playlist, "item-deleted", VLC_VAR_INTEGER );
- val.i_int = -1;
- var_Set( p_playlist, "item-deleted", val );
+ var_Create( p_playlist, "playlist-item-deleted", VLC_VAR_INTEGER );
+ var_SetInteger( p_playlist, "playlist-item-deleted", -1 );
- var_Create( p_playlist, "item-append", VLC_VAR_ADDRESS );
+ var_Create( p_playlist, "playlist-item-append", VLC_VAR_ADDRESS );
- var_Create( p_playlist, "playlist-current", VLC_VAR_INTEGER );
- 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 = VLC_TRUE;
- var_Set( p_playlist, "intf-show", val );
+ var_Create( p_playlist, "item-current", VLC_VAR_ADDRESS );
+ var_Create( p_playlist, "input-current", VLC_VAR_ADDRESS );
var_Create( p_playlist, "activity", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "activity", 0 );
/* Variables to control playback */
- var_CreateGetBool( p_playlist, "play-and-stop" );
- var_CreateGetBool( p_playlist, "play-and-exit" );
- var_CreateGetBool( p_playlist, "random" );
- var_CreateGetBool( p_playlist, "repeat" );
- var_CreateGetBool( p_playlist, "loop" );
+ var_Create( p_playlist, "play-and-stop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "play-and-exit", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Create( p_playlist, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_AddCallback( p_playlist, "random", RandomCallback, NULL );
+
+ /* */
+ var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+ /* Variables to preserve video output parameters */
+ var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+
+ /* Audio output parameters */
+ var_Create( p_playlist, "volume-muted", VLC_VAR_BOOL );
+ var_Create( p_playlist, "saved-volume", VLC_VAR_INTEGER );
+ var_Create( p_playlist, "volume-change", VLC_VAR_VOID );
+ /* FIXME: horrible hack for audio output interface code */
+ var_Create( p_playlist, "find-input-callback", VLC_VAR_ADDRESS );
+ var_SetAddress( p_playlist, "find-input-callback", playlist_FindInput );
+}
+
+playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )
+{
+ PL_ASSERT_LOCKED;
+
+ return pl_priv(p_playlist)->status.p_item;
}
+
+int playlist_Status( playlist_t * p_playlist )
+{
+ PL_ASSERT_LOCKED;
+
+ return pl_priv(p_playlist)->status.i_status;
+}
+