{
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;
- TAB_INIT( p_playlist->i_sds, p_playlist->pp_sds );
- MALLOC_NULL( p_playlist->p, playlist_private_t );
- memset( p_playlist->p, 0, sizeof( playlist_private_t ) );
+ assert( offsetof( playlist_private_t, public_data ) == 0 );
+ p_playlist = &p->public_data;
+ 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 );
/* Initialise data structures */
- p_playlist->p->p_playlist = p_playlist;
p_playlist->i_last_playlist_id = 0;
- p_playlist->p_input = NULL;
+ pl_priv(p_playlist)->p_input = NULL;
p_playlist->gc_date = 0;
- p_playlist->b_cant_sleep = false;
+ pl_priv(p_playlist)->b_cant_sleep = false;
ARRAY_INIT( p_playlist->items );
ARRAY_INIT( p_playlist->all_items );
- ARRAY_INIT( p_playlist->items_to_delete );
+ 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 = true;
p_playlist->last_rebuild_date = 0;
- p_playlist->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
+ pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
- p_playlist->b_doing_ml = false;
+ pl_priv(p_playlist)->b_doing_ml = false;
- p_playlist->b_auto_preparse =
+ pl_priv(p_playlist)->b_auto_preparse =
var_CreateGetBool( p_playlist, "auto-preparse" ) ;
PL_LOCK; /* playlist_NodeCreate will check for it */
}
/* Initial status */
- p_playlist->status.p_item = NULL;
- p_playlist->status.p_node = p_playlist->p_local_onelevel;
- p_playlist->request.b_request = false;
- p_playlist->status.i_status = PLAYLIST_STOPPED;
+ pl_priv(p_playlist)->status.p_item = NULL;
+ pl_priv(p_playlist)->status.p_node = p_playlist->p_local_onelevel;
+ pl_priv(p_playlist)->request.b_request = false;
+ pl_priv(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 = false;
+ b_save = pl_priv(p_playlist)->b_auto_preparse;
+ pl_priv(p_playlist)->b_auto_preparse = false;
playlist_MLLoad( p_playlist );
- p_playlist->b_auto_preparse = true;
+ pl_priv(p_playlist)->b_auto_preparse = true;
vlc_object_set_destructor( p_playlist, playlist_Destructor );
static void playlist_Destructor( vlc_object_t * p_this )
{
playlist_t * p_playlist = (playlist_t *)p_this;
- playlist_preparse_t *p_preparse = &p_playlist->p->preparse;
/* Destroy the item preparser */
+ playlist_preparse_t *p_preparse = &pl_priv(p_playlist)->preparse;
if (p_preparse->up)
{
vlc_cancel (p_preparse->thread);
vlc_mutex_destroy (&p_preparse->lock);
/* Destroy the item meta-infos fetcher */
- if( p_playlist->p->p_fetcher )
+ playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->fetcher;
+ if (p_fetcher->up)
{
- vlc_object_release( p_playlist->p->p_fetcher );
+ vlc_cancel (p_fetcher->thread);
+ vlc_join (p_fetcher->thread, NULL);
}
+ while (p_fetcher->i_waiting > 0)
+ { /* Any left-over unparsed item? */
+ vlc_gc_decref (p_fetcher->pp_waiting[0]);
+ REMOVE_ELEM (p_fetcher->pp_waiting, p_fetcher->i_waiting, 0);
+ }
+ vlc_cond_destroy (&p_fetcher->wait);
+ vlc_mutex_destroy (&p_fetcher->lock);
+
msg_Dbg( p_this, "Destroyed" );
}
{
if( mdate() - p_playlist->gc_date < 1000000 )
{
- p_playlist->b_cant_sleep = true;
+ pl_priv(p_playlist)->b_cant_sleep = true;
return;
}
else if( p_playlist->gc_date == 0 )
return;
}
- p_playlist->b_cant_sleep = false;
+ pl_priv(p_playlist)->b_cant_sleep = false;
}
/* Input Callback */
{
PL_ASSERT_LOCKED;
- if( !p_playlist->p_input ) return;
+ if( !pl_priv(p_playlist)->p_input ) return;
- input_thread_t * p_input = p_playlist->p_input;
+ input_thread_t * p_input = pl_priv(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;
+ pl_priv(p_playlist)->p_input = NULL;
/* Release the playlist lock, because we may get stuck
* in vlc_object_release() for some time. */
if( p_input )
{
- vlc_object_yield( p_input );
- p_playlist->p_input = p_input;
+ vlc_object_hold( p_input );
+ pl_priv(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 );
{
input_thread_t * p_input;
PL_LOCK;
- p_input = p_playlist->p_input;
- if( p_input ) vlc_object_yield( p_input );
+ p_input = pl_priv(p_playlist)->p_input;
+ if( p_input ) vlc_object_hold( p_input );
PL_UNLOCK;
return p_input;
}
{
PL_ASSERT_LOCKED;
- return p_playlist->status.p_item;
+ return pl_priv(p_playlist)->status.p_item;
}
playlist_item_t * get_current_status_node( playlist_t * p_playlist )
{
PL_ASSERT_LOCKED;
- return p_playlist->status.p_node;
+ return pl_priv(p_playlist)->status.p_node;
}
void set_current_status_item( playlist_t * p_playlist,
{
PL_ASSERT_LOCKED;
- if( p_playlist->status.p_item &&
- p_playlist->status.p_item->i_flags & PLAYLIST_REMOVE_FLAG &&
- p_playlist->status.p_item != p_item )
+ 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 )
{
/* It's unsafe given current design to delete a playlist item :(
- playlist_ItemDelete( p_playlist->status.p_item ); */
+ playlist_ItemDelete( pl_priv(p_playlist)->status.p_item ); */
}
- p_playlist->status.p_item = p_item;
+ pl_priv(p_playlist)->status.p_item = p_item;
}
void set_current_status_node( playlist_t * p_playlist,
{
PL_ASSERT_LOCKED;
- if( p_playlist->status.p_node &&
- p_playlist->status.p_node->i_flags & PLAYLIST_REMOVE_FLAG &&
- p_playlist->status.p_node != p_node )
+ 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 )
{
/* It's unsafe given current design to delete a playlist item :(
- playlist_ItemDelete( p_playlist->status.p_node ); */
+ playlist_ItemDelete( pl_priv(p_playlist)->status.p_node ); */
}
- p_playlist->status.p_node = p_node;
+ pl_priv(p_playlist)->status.p_node = p_node;
}
/**
check_input:
/* If there is an input, check that it doesn't need to die. */
- if( p_playlist->p_input )
+ if( pl_priv(p_playlist)->p_input )
{
- if( p_playlist->request.b_request && !p_playlist->p_input->b_die )
+ if( pl_priv(p_playlist)->request.b_request && !pl_priv(p_playlist)->p_input->b_die )
{
PL_DEBUG( "incoming request - stopping current input" );
- input_StopThread( p_playlist->p_input );
+ input_StopThread( pl_priv(p_playlist)->p_input );
}
/* This input is dead. Remove it ! */
- if( p_playlist->p_input->b_dead )
+ if( pl_priv(p_playlist)->p_input->b_dead )
{
int i_activity;
input_thread_t *p_input;
- sout_instance_t **pp_sout = &p_playlist->p->p_sout;
+ sout_instance_t **pp_sout = &pl_priv(p_playlist)->p_sout;
PL_DEBUG( "dead input" );
- p_input = p_playlist->p_input;
+ p_input = pl_priv(p_playlist)->p_input;
assert( *pp_sout == NULL );
if( var_CreateGetBool( p_input, "sout-keep" ) )
playlist_release_current_input( p_playlist );
p_playlist->gc_date = mdate();
- p_playlist->b_cant_sleep = true;
+ pl_priv(p_playlist)->b_cant_sleep = true;
i_activity= var_GetInteger( p_playlist, "activity" );
var_SetInteger( p_playlist, "activity", i_activity -
goto check_input;
}
/* This input is dying, let it do */
- else if( p_playlist->p_input->b_die )
+ else if( pl_priv(p_playlist)->p_input->b_die )
{
PL_DEBUG( "dying input" );
PL_UNLOCK;
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 )
+ else if( pl_priv(p_playlist)->p_input->b_error
+ || pl_priv(p_playlist)->p_input->b_eof )
{
PL_DEBUG( "finished input" );
- input_StopThread( p_playlist->p_input );
+ input_StopThread( pl_priv(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 )
+ else if( pl_priv(p_playlist)->p_input->i_state != INIT_S )
{
ObjectGarbageCollector( p_playlist, false );
}
* - Request, running requested -> start new item
* - Request, stopped requested -> collect garbage
*/
- int i_status = p_playlist->request.b_request ?
- p_playlist->request.i_status : p_playlist->status.i_status;
+ int i_status = pl_priv(p_playlist)->request.b_request ?
+ pl_priv(p_playlist)->request.i_status : pl_priv(p_playlist)->status.i_status;
if( i_status != PLAYLIST_STOPPED )
{
msg_Dbg( p_playlist, "starting new item" );
if( p_item == NULL )
{
msg_Dbg( p_playlist, "nothing to play" );
- p_playlist->status.i_status = PLAYLIST_STOPPED;
+ pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED;
if( b_playexit == true )
{
}
else
{
- const bool b_gc_forced = p_playlist->status.i_status != PLAYLIST_STOPPED;
+ const bool b_gc_forced = pl_priv(p_playlist)->status.i_status != PLAYLIST_STOPPED;
- p_playlist->status.i_status = PLAYLIST_STOPPED;
+ pl_priv(p_playlist)->status.i_status = PLAYLIST_STOPPED;
/* Collect garbage */
ObjectGarbageCollector( p_playlist, b_gc_forced );
while( 1 )
{
PL_LOCK;
- if( p_playlist->p_input == NULL )
+ if( pl_priv(p_playlist)->p_input == NULL )
{
PL_UNLOCK;
break;
}
- if( p_playlist->p_input->b_dead )
+ if( pl_priv(p_playlist)->p_input->b_dead )
{
/* remove input */
playlist_release_current_input( p_playlist );
PL_UNLOCK;
continue;
}
- else if( p_playlist->p_input->b_die )
+ else if( pl_priv(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 )
+ else if( pl_priv(p_playlist)->p_input->b_error || pl_priv(p_playlist)->p_input->b_eof )
{
- input_StopThread( p_playlist->p_input );
+ input_StopThread( pl_priv(p_playlist)->p_input );
PL_UNLOCK;
continue;
}
else
{
- p_playlist->p_input->b_eof = 1;
+ pl_priv(p_playlist)->p_input->b_eof = 1;
}
PL_UNLOCK;
#ifdef ENABLE_SOUT
/* close the remaining sout-keep (if there was no input atm) */
- sout_instance_t *p_sout = p_playlist->p->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->p_fetcher );
- vlc_thread_join( p_playlist->p->p_fetcher );
-
PL_LOCK;
/* Release the current node */
free( p_del );
FOREACH_END();
ARRAY_RESET( p_playlist->all_items );
- FOREACH_ARRAY( playlist_item_t *p_del, p_playlist->items_to_delete )
+ FOREACH_ARRAY( playlist_item_t *p_del, pl_priv(p_playlist)->items_to_delete )
free( p_del->pp_children );
vlc_gc_decref( p_del->p_input );
free( p_del );
FOREACH_END();
- ARRAY_RESET( p_playlist->items_to_delete );
+ ARRAY_RESET( pl_priv(p_playlist)->items_to_delete );
ARRAY_RESET( p_playlist->items );
ARRAY_RESET( p_playlist->current );
void *playlist_PreparseLoop( void *data )
{
playlist_preparse_t *p_preparse = data;
- playlist_t *p_playlist = ((playlist_private_t *)(((char *)p_preparse)
- - offsetof(playlist_private_t, preparse)))->p_playlist;
- int i_activity;
+ playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_preparse)
+ - offsetof(playlist_private_t, preparse)))->public_data;
for( ;; )
{
*/
char *psz_arturl = input_item_GetArtURL( p_current );
char *psz_name = input_item_GetName( p_current );
- if( p_playlist->p->p_fetcher->i_art_policy == ALBUM_ART_ALL &&
- ( !psz_arturl || strncmp( psz_arturl, "file://", 7 ) ) )
+ playlist_fetcher_t *p_fetcher = &pl_priv(p_playlist)->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->p_fetcher );
- if( vlc_object_alive( p_playlist->p->p_fetcher ) )
- {
- INSERT_ELEM( p_playlist->p->p_fetcher->pp_waiting,
- p_playlist->p->p_fetcher->i_waiting,
- p_playlist->p->p_fetcher->i_waiting, p_current);
- vlc_object_signal_unlocked( p_playlist->p->p_fetcher );
- }
- else
- vlc_gc_decref( p_current );
- vlc_object_unlock( p_playlist->p->p_fetcher );
+ vlc_mutex_lock( &p_fetcher->lock );
+ INSERT_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting,
+ p_fetcher->i_waiting, p_current);
+ vlc_cond_signal( &p_fetcher->wait );
+ vlc_mutex_unlock( &p_fetcher->lock );
}
else
{
vlc_restorecancel( canc );
}
- i_activity = var_GetInteger( p_playlist, "activity" );
+ int i_activity = var_GetInteger( p_playlist, "activity" );
if( i_activity < 0 ) i_activity = 0;
/* Sleep at least 1ms */
msleep( (i_activity+1) * 1000 );
/**
* Fetcher loop
*
- * Main loop for secondary preparser queue
- * \param p_obj items to preparse
- * \return nothing
+ * \return never
*/
-void playlist_FetcherLoop( playlist_fetcher_t *p_obj )
+void *playlist_FetcherLoop( void *data )
{
- playlist_t *p_playlist = (playlist_t *)p_obj->p_parent;
- input_item_t *p_item;
- int i_activity;
+ playlist_fetcher_t *p_fetcher = data;
+ playlist_t *p_playlist = &((playlist_private_t *)(((char *)p_fetcher)
+ - offsetof(playlist_private_t, fetcher)))->public_data;
- 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_item;
+
+ vlc_mutex_lock( &p_fetcher->lock );
+ mutex_cleanup_push( &p_fetcher->lock );
+
+ while( p_fetcher->i_waiting == 0 )
+ vlc_cond_wait( &p_fetcher->wait, &p_fetcher->lock );
- p_item = p_obj->pp_waiting[0];
- REMOVE_ELEM( p_obj->pp_waiting, p_obj->i_waiting, 0 );
- vlc_object_unlock( p_obj );
+ p_item = p_fetcher->pp_waiting[0];
+ REMOVE_ELEM( p_fetcher->pp_waiting, p_fetcher->i_waiting, 0 );
+ vlc_cleanup_run( );
+
+ int canc = vlc_savecancel();
if( p_item )
{
int i_ret;
- /* Check if it is not yet preparsed and if so wait for it (at most 0.5s)
+ /* 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 ... */
+ * 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 );
+ b_break = ( !pl_priv(p_playlist)->p_input || input_GetItem(pl_priv(p_playlist)->p_input) != p_item ||
+ pl_priv(p_playlist)->p_input->b_die || pl_priv(p_playlist)->p_input->b_eof || pl_priv(p_playlist)->p_input->b_error );
PL_UNLOCK;
if( b_break )
break;
}
vlc_gc_decref( p_item );
}
- vlc_object_lock( p_obj );
- i_activity = var_GetInteger( p_playlist, "activity" );
+ vlc_restorecancel( canc );
+
+ int 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;
}
static void VariablesInit( playlist_t *p_playlist )
var_AddCallback( p_playlist, "random", RandomCallback, NULL );
}
+
+int playlist_CurrentId( playlist_t * p_playlist )
+{
+ return pl_priv(p_playlist)->status.p_item->i_id;
+}
+
+bool playlist_IsPlaying( playlist_t * p_playlist )
+{
+ return ( pl_priv(p_playlist)->status.i_status == PLAYLIST_RUNNING &&
+ !(pl_priv(p_playlist)->request.b_request && pl_priv(p_playlist)->request.i_status == PLAYLIST_STOPPED) );
+}
+
+playlist_item_t * playlist_CurrentPlayingItem( playlist_t * p_playlist )
+{
+ return pl_priv(p_playlist)->status.p_item;
+}
+
+int playlist_Status( playlist_t * p_playlist )
+{
+ return pl_priv(p_playlist)->status.i_status;
+}
projects / vlc / blobdiff