/*****************************************************************************
* 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>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+#include <vlc_common.h>
#include <vlc_sout.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
* Local prototypes
*****************************************************************************/
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 )
{
(void)psz_cmd; (void)oldval; (void)newval; (void)a;
- ((playlist_t*)p_this)->b_reset_currently_playing = VLC_TRUE;
+ ((playlist_t*)p_this)->b_reset_currently_playing = true;
playlist_Signal( ((playlist_t*)p_this) );
return VLC_SUCCESS;
}
*/
playlist_t * playlist_Create( vlc_object_t *p_parent )
{
+ static const char playlist_name[] = "playlist";
playlist_t *p_playlist;
- vlc_bool_t b_save;
- int i_tree;
+ bool b_save;
/* Allocate structure */
- p_playlist = vlc_object_create( p_parent, VLC_OBJECT_PLAYLIST );
+ p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ),
+ VLC_OBJECT_GENERIC, playlist_name );
if( !p_playlist )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
- p_playlist->p_internal = malloc(sizeof(struct playlist_internal_t));
- memset( p_playlist->p_internal, 0, sizeof(struct playlist_internal_t) );
+ 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->i_last_input_id = 0;
p_playlist->p_input = NULL;
p_playlist->gc_date = 0;
- p_playlist->b_cant_sleep = VLC_FALSE;
+ p_playlist->b_cant_sleep = false;
ARRAY_INIT( p_playlist->items );
ARRAY_INIT( p_playlist->all_items );
- ARRAY_INIT( p_playlist->input_items );
ARRAY_INIT( p_playlist->current );
p_playlist->i_current_index = 0;
- p_playlist->b_reset_currently_playing = VLC_TRUE;
+ 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 = VLC_FALSE;
+ p_playlist->b_doing_ml = false;
p_playlist->b_auto_preparse =
- var_CreateGetBool( p_playlist, "auto-preparse") ;
+ var_CreateGetBool( p_playlist, "auto-preparse" ) ;
p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
- 0 );
+ 0, NULL );
p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL,
- 0 );
+ 0, p_playlist->p_root_category->p_input );
if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
return NULL;
/* Create playlist and media library */
- p_playlist->p_local_category = playlist_NodeCreate( p_playlist,
- _( "Playlist" ),p_playlist->p_root_category, 0 );
- p_playlist->p_local_onelevel = playlist_NodeCreate( p_playlist,
- _( "Playlist" ), p_playlist->p_root_onelevel, 0 );
+ playlist_NodesPairCreate( p_playlist, _( "Playlist" ),
+ &p_playlist->p_local_category,
+ &p_playlist->p_local_onelevel, false );
+
p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
!p_playlist->p_local_onelevel->p_input )
return NULL;
- /* 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( config_GetInt( p_playlist, "media-library") )
{
- p_playlist->p_ml_category = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_category, 0 );
- p_playlist->p_ml_onelevel = playlist_NodeCreate( p_playlist,
- _( "Media Library" ), p_playlist->p_root_onelevel, 0 );
+ playlist_NodesPairCreate( p_playlist, _( "Media Library" ),
+ &p_playlist->p_ml_category,
+ &p_playlist->p_ml_onelevel, false );
if(!p_playlist->p_ml_category || !p_playlist->p_ml_onelevel)
return NULL;
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;
-
}
else
{
/* 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->request.b_request = false;
p_playlist->status.i_status = PLAYLIST_STOPPED;
p_playlist->i_sort = SORT_ID;
p_playlist->i_order = ORDER_NORMAL;
+
b_save = p_playlist->b_auto_preparse;
- p_playlist->b_auto_preparse = VLC_FALSE;
+ p_playlist->b_auto_preparse = false;
playlist_MLLoad( p_playlist );
- p_playlist->b_auto_preparse = VLC_TRUE;
+ p_playlist->b_auto_preparse = true;
+
+ vlc_object_set_destructor( p_playlist, playlist_Destructor );
+
return p_playlist;
}
-void playlist_Destroy( playlist_t *p_playlist )
+/**
+ * Destroy playlist
+ *
+ * Destroy a playlist structure.
+ * \param p_playlist the playlist object
+ * \return nothing
+ */
+
+static void playlist_Destructor( vlc_object_t * p_this )
{
- 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" );
-
- vlc_mutex_destroy( &p_playlist->gc_lock );
- vlc_object_detach( p_playlist );
- free( p_playlist->p_internal );
- vlc_object_destroy( p_playlist );
+ playlist_t * p_playlist = (playlist_t *)p_this;
+
+ if( p_playlist->p_preparse )
+ vlc_object_release( p_playlist->p_preparse );
+
+ 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, vlc_bool_t b_force )
+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 )
{
- p_playlist->b_cant_sleep = VLC_TRUE;
+ p_playlist->b_cant_sleep = true;
return;
}
else if( p_playlist->gc_date == 0 )
}
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(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 ) ) )
+ 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. */
+ printf("_______ releasing\n");
+ 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 )
{
- 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 );
+ 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 );
}
- p_playlist->b_cant_sleep = VLC_FALSE;
- vlc_mutex_unlock( &p_playlist->gc_lock );
}
-/** Main loop for the 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
+ *
+ * Main loop for the playlist
+ * \param p_playlist the playlist object
+ * \return nothing
+ */
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" );
+ bool 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"),
+ ResetCurrentlyPlaying( p_playlist, var_GetBool( p_playlist, "random" ),
p_playlist->status.p_item );
p_playlist->last_rebuild_date = mdate();
}
{
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 input_DestroyThread() for some time. */
- PL_UNLOCK
+ assert( *pp_sout == NULL );
+ if( var_CreateGetBool( p_input, "sout-keep" ) )
+ *pp_sout = input_DetachSout( p_input );
/* Destroy input */
- input_DestroyThread( p_input );
-
- PL_LOCK;
+ playlist_release_current_input( p_playlist );
p_playlist->gc_date = mdate();
- p_playlist->b_cant_sleep = VLC_TRUE;
+ p_playlist->b_cant_sleep = true;
if( p_playlist->status.p_item->i_flags
& PLAYLIST_REMOVE_FLAG )
p_playlist->status.p_item = NULL;
}
- i_activity= var_GetInteger( p_playlist, "activity") ;
+ 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 */
{
PL_DEBUG( "dying input" );
PL_UNLOCK;
- msleep( 25000 ); // 25 ms
+ msleep( INTF_IDLE_SLEEP );
PL_LOCK;
goto check_input;
}
else if( p_playlist->p_input->i_state != INIT_S )
{
PL_UNLOCK;
- ObjectGarbageCollector( p_playlist, VLC_FALSE );
+ ObjectGarbageCollector( p_playlist, false );
PL_LOCK;
}
}
* - 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 );
+ */
+ 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 );
- if( p_item == NULL )
- {
+ if( p_item == NULL )
+ {
msg_Dbg( p_playlist, "nothing to play" );
- if( b_playexit == VLC_TRUE )
+ p_playlist->status.i_status = PLAYLIST_STOPPED;
+ PL_UNLOCK;
+
+ if( b_playexit == true )
{
msg_Info( p_playlist, "end of playlist, exiting" );
vlc_object_kill( p_playlist->p_libvlc );
}
- p_playlist->status.i_status = PLAYLIST_STOPPED;
- PL_UNLOCK
-
- ObjectGarbageCollector( p_playlist, VLC_TRUE );
+ ObjectGarbageCollector( p_playlist, true );
return;
}
playlist_PlayItem( p_playlist, p_item );
}
else
{
- const vlc_bool_t b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED;
+ const bool b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED;
p_playlist->status.i_status = PLAYLIST_STOPPED;
if( p_playlist->status.p_item &&
PL_LOCK;
}
}
- PL_UNLOCK
+ PL_UNLOCK;
}
-/** Playlist dying last loop */
+/**
+ * Last loop
+ *
+ * The playlist is dying so do the last loop
+ * \param p_playlist the playlist object
+ * \return nothing
+*/
void playlist_LastLoop( playlist_t *p_playlist )
{
- vlc_object_t *p_obj;
-
/* If there is an input, kill it */
while( 1 )
{
- PL_LOCK
-
+ PL_LOCK;
if( p_playlist->p_input == NULL )
{
- PL_UNLOCK
+ PL_UNLOCK;
break;
}
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 */
- input_DestroyThread( p_input );
+ PL_UNLOCK;
continue;
}
else if( p_playlist->p_input->b_die )
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
{
input_StopThread( p_playlist->p_input );
- PL_UNLOCK
+ PL_UNLOCK;
continue;
}
else
{
p_playlist->p_input->b_eof = 1;
}
-
- PL_UNLOCK
+ PL_UNLOCK;
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->p_internal->i_asds )
+ if( p_playlist->status.p_item &&
+ p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG )
{
- playlist_ServicesDiscoveryRemove( p_playlist,
- p_playlist->p_internal->pp_asds[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 );
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 */
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 );
- free( p_del );
- FOREACH_END();
- ARRAY_RESET( p_playlist->input_items );
-
ARRAY_RESET( p_playlist->items );
ARRAY_RESET( p_playlist->current );
PL_UNLOCK;
}
-/** Main loop for preparser queue */
+/**
+ * Preparse loop
+ *
+ * Main loop for preparser queue
+ * \param p_obj items to preparse
+ * \return nothing
+ */
void playlist_PreparseLoop( playlist_preparse_t *p_obj )
{
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_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;
}
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 );
+ vlc_object_unlock( p_obj );
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 ) )
+ if( p_current->i_type == ITEM_TYPE_FILE )
{
- b_preparsed = VLC_TRUE;
stats_TimerStart( p_playlist, "Preparse run",
STATS_TIMER_PREPARSE );
/* Do not preparse if it is already done (like by playing it) */
PL_LOCK;
}
stats_TimerStop( p_playlist, STATS_TIMER_PREPARSE );
- }
- PL_UNLOCK;
- if( b_preparsed )
- {
- input_item_SetPreparsed( p_current, VLC_TRUE );
+ PL_UNLOCK;
+ input_item_SetPreparsed( p_current, true );
var_SetInteger( p_playlist, "item-change", p_current->i_id );
+ PL_LOCK;
}
- PL_LOCK;
-
/* If we haven't retrieved enough meta, add to secondary queue
* which will run the "meta fetchers".
* This only checks for meta, not for art
*/
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 ) )
+ if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
+ ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
{
- 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 = VLC_FALSE;
- vlc_mutex_lock( &p_playlist->p_fetcher->object_lock );
- INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
- p_playlist->p_fetcher->i_waiting,
- p_playlist->p_fetcher->i_waiting, p);
- vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
- vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
- }
- /* We already have all needed meta, but we need art right now */
- else if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
- EMPTY_STR( psz_arturl ) )
- {
- 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 = VLC_TRUE;
- vlc_mutex_lock( &p_playlist->p_fetcher->object_lock );
- INSERT_ELEM( p_playlist->p_fetcher->p_waiting,
+ vlc_object_lock( p_playlist->p_fetcher );
+ INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
p_playlist->p_fetcher->i_waiting,
- p_playlist->p_fetcher->i_waiting, p);
- vlc_mutex_unlock( &p_playlist->p_fetcher->object_lock );
- vlc_cond_signal( &p_playlist->p_fetcher->object_wait );
+ p_playlist->p_fetcher->i_waiting, p_current);
+ vlc_object_signal_unlocked( p_playlist->p_fetcher );
+ vlc_object_unlock( p_playlist->p_fetcher );
}
else
{
else
PL_UNLOCK;
- vlc_mutex_lock( &p_obj->object_lock );
+ vlc_object_lock( p_obj );
i_activity = var_GetInteger( p_playlist, "activity" );
if( i_activity < 0 ) i_activity = 0;
- vlc_mutex_unlock( &p_obj->object_lock );
+ 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 );
}
-/** Main loop for secondary preparser queue */
+/**
+ * Fetcher loop
+ *
+ * Main loop for secondary preparser queue
+ * \param p_obj items to preparse
+ * \return nothing
+ */
void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
{
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_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++ )
{
- input_MetaFetch( p_playlist, p_item );
- var_SetInteger( p_playlist, "item-change", p_item->i_id );
- /* 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 = VLC_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;
+ 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
- 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++ )
- {
- vlc_bool_t 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, VLC_TRUE );
- else {
- input_item_SetArtFetched( p_item, VLC_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, VLC_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, VLC_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_mutex_lock( &p_obj->object_lock );
+ vlc_object_lock( p_obj );
i_activity = var_GetInteger( p_playlist, "activity" );
if( i_activity < 0 ) i_activity = 0;
- vlc_mutex_unlock( &p_obj->object_lock );
+ 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 )
vlc_value_t val;
/* These variables control updates */
var_Create( p_playlist, "intf-change", VLC_VAR_BOOL );
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_playlist, "intf-change", val );
var_Create( p_playlist, "item-change", 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, "activity", VLC_VAR_INTEGER );
var_SetInteger( p_playlist, "activity", 0 );
projects / vlc / blobdiff