# include "config.h"
#endif
+#include <stddef.h>
#include <assert.h>
#include <vlc_common.h>
#include <vlc_sout.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;
+ playlist_private_t *p;
bool b_save;
/* Allocate structure */
- p_playlist = vlc_custom_create( p_parent, sizeof( *p_playlist ),
- VLC_OBJECT_GENERIC, playlist_name );
- if( !p_playlist )
+ p = vlc_custom_create( p_parent, sizeof( *p ),
+ VLC_OBJECT_GENERIC, playlist_name );
+ if( !p )
return NULL;
+ assert( offsetof( playlist_private_t, public_data ) == 0 );
+ p_playlist = &p->public_data;
TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
libvlc_priv(p_parent->p_libvlc)->p_playlist = p_playlist;
p_playlist->b_auto_preparse =
var_CreateGetBool( p_playlist, "auto-preparse" ) ;
+ PL_LOCK; /* playlist_NodeCreate will check for it */
p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
0, NULL );
p_playlist->p_root_onelevel = playlist_NodeCreate( p_playlist, NULL, NULL,
0, p_playlist->p_root_category->p_input );
+ PL_UNLOCK;
if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
return NULL;
static void playlist_Destructor( vlc_object_t * p_this )
{
playlist_t * p_playlist = (playlist_t *)p_this;
+ playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
- if( p_playlist->p_preparse )
+ /* Destroy the item preparser */
+ if (p_preparse->up)
{
- vlc_object_release( p_playlist->p_preparse );
+ vlc_cancel (p_preparse->thread);
+ vlc_join (p_preparse->thread, NULL);
+ }
+ while (p_preparse->i_waiting > 0)
+ { /* Any left-over unparsed item? */
+ vlc_gc_decref (p_preparse->pp_waiting[0]);
+ REMOVE_ELEM (p_preparse->pp_waiting, p_preparse->i_waiting, 0);
}
+ vlc_cond_destroy (&p_preparse->wait);
+ vlc_mutex_destroy (&p_preparse->lock);
- if( p_playlist->p_fetcher )
+ /* Destroy the item meta-infos fetcher */
+ if( pl_priv(p_playlist)->p_fetcher )
{
- vlc_object_release( p_playlist->p_fetcher );
+ vlc_object_release( pl_priv(p_playlist)->p_fetcher );
}
msg_Dbg( p_this, "Destroyed" );
}
/* Release the playlist lock, because we may get stuck
* in vlc_object_release() for some time. */
PL_UNLOCK;
+ vlc_thread_join( p_input );
vlc_object_release( p_input );
PL_LOCK;
}
{
int i_activity;
input_thread_t *p_input;
- sout_instance_t **pp_sout =
- &libvlc_priv(p_playlist->p_libvlc)->p_sout;
+ sout_instance_t **pp_sout = &pl_priv(p_playlist)->p_sout;
PL_DEBUG( "dead input" );
}
playlist_PlayItem( p_playlist, p_item );
/* playlist_PlayItem loose input event, we need to recheck */
- //if( !p_playlist->b_cant_sleep )
- goto check_input;
+ goto check_input;
}
else
{
#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;
+ sout_instance_t *p_sout = pl_priv(p_playlist)->p_sout;
if (p_sout)
sout_DeleteInstance( p_sout );
#endif
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 );
+ vlc_object_kill( pl_priv(p_playlist)->p_fetcher );
+ vlc_thread_join( pl_priv(p_playlist)->p_fetcher );
PL_LOCK;
}
/**
- * Preparse loop
+ * Preparse queue loop
*
- * Main loop for preparser queue
- * \param p_obj items to preparse
- * \return nothing
+ * @param p_obj preparse structure
+ * @return never
*/
-void playlist_PreparseLoop( playlist_preparse_t *p_obj )
+void *playlist_PreparseLoop( void *data )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
- input_item_t *p_current;
+ playlist_preparse_t *p_preparse = data;
+ playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_preparse)
+ - offsetof(playlist_private_t, preparse)))->public_data;
int i_activity;
- vlc_object_lock( p_obj );
-
- while( vlc_object_alive( p_obj ) )
+ for( ;; )
{
- if( p_obj->i_waiting == 0 )
- {
- vlc_object_wait( p_obj );
- continue;
- }
+ input_item_t *p_current;
- p_current = p_obj->pp_waiting[0];
- REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
- vlc_object_unlock( p_obj );
+ vlc_mutex_lock( &p_preparse->lock );
+ mutex_cleanup_push( &p_preparse->lock );
+
+ while( p_preparse->i_waiting == 0 )
+ vlc_cond_wait( &p_preparse->wait, &p_preparse->lock );
+
+ p_current = p_preparse->pp_waiting[0];
+ REMOVE_ELEM( p_preparse->pp_waiting, p_preparse->i_waiting, 0 );
+ vlc_cleanup_run( );
- PL_LOCK;
if( p_current )
{
+ int canc = vlc_savecancel ();
+ PL_LOCK;
if( p_current->i_type == ITEM_TYPE_FILE )
{
stats_TimerStart( p_playlist, "Preparse run",
*/
char *psz_arturl = input_item_GetArtURL( p_current );
char *psz_name = input_item_GetName( p_current );
- if( p_playlist->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
- ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
+ playlist_fetcher_t *p_fetcher = pl_priv(p_playlist)->p_fetcher;
+ if( p_fetcher->i_art_policy == ALBUM_ART_ALL &&
+ ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
{
PL_DEBUG("meta ok for %s, need to fetch art", psz_name );
- vlc_object_lock( p_playlist->p_fetcher );
- if( vlc_object_alive( p_playlist->p_fetcher ) )
+ vlc_object_lock( p_fetcher );
+ if( vlc_object_alive( p_fetcher ) )
{
- INSERT_ELEM( p_playlist->p_fetcher->pp_waiting,
- p_playlist->p_fetcher->i_waiting,
- p_playlist->p_fetcher->i_waiting, p_current);
- vlc_object_signal_unlocked( p_playlist->p_fetcher );
+ INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting,
+ p_fetcher->i_waiting, p_current);
+ vlc_object_signal_unlocked( p_fetcher );
}
else
vlc_gc_decref( p_current );
- vlc_object_unlock( p_playlist->p_fetcher );
+ vlc_object_unlock( p_fetcher );
}
else
{
}
free( psz_name );
free( psz_arturl );
- PL_UNLOCK;
+ PL_UNLOCK;
+ vlc_restorecancel( canc );
}
- else
- PL_UNLOCK;
- vlc_object_lock( p_obj );
i_activity = var_GetInteger( p_playlist, "activity" );
if( i_activity < 0 ) i_activity = 0;
- vlc_object_unlock( p_obj );
/* Sleep at least 1ms */
msleep( (i_activity+1) * 1000 );
- vlc_object_lock( p_obj );
- }
-
- while( p_obj->i_waiting > 0 )
- {
- vlc_gc_decref( p_obj->pp_waiting[0] );
- REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
}
- vlc_object_unlock( p_obj );
+ assert( 0 );
+ return NULL;
}
/**
projects / vlc / blobdiff