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 */
pl_priv(p_playlist)->b_reset_currently_playing = true;
pl_priv(p_playlist)->last_rebuild_date = 0;
- pl_priv(p_playlist)->b_tree = var_CreateGetBool( p_playlist, "playlist-tree" );
+ pl_priv(p_playlist)->b_tree = var_InheritBool( p_parent, "playlist-tree" );
pl_priv(p_playlist)->b_doing_ml = false;
pl_priv(p_playlist)->b_auto_preparse =
- var_CreateGetBool( p_playlist, "auto-preparse" ) ;
+ var_InheritBool( p_parent, "auto-preparse" );
- PL_LOCK; /* playlist_NodeCreate will check for it */
- p_playlist->p_root_category = playlist_NodeCreate( p_playlist, NULL, NULL,
+ /* Create the root node */
+ PL_LOCK;
+ p_playlist->p_root = 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 ) return NULL;
- if( !p_playlist->p_root_category || !p_playlist->p_root_onelevel )
- 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 */
- PL_LOCK; /* playlist_NodesPairCreate will check for it */
- playlist_NodesPairCreate( p_playlist, _( "Playlist" ),
- &p_playlist->p_local_category,
- &p_playlist->p_local_onelevel, false );
PL_UNLOCK;
- p_playlist->p_local_category->i_flags |= PLAYLIST_RO_FLAG;
- p_playlist->p_local_onelevel->i_flags |= PLAYLIST_RO_FLAG;
+ if( !p_playlist->p_playing ) return NULL;
- if( !p_playlist->p_local_category || !p_playlist->p_local_onelevel ||
- !p_playlist->p_local_category->p_input ||
- !p_playlist->p_local_onelevel->p_input )
- 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 )
{
- PL_LOCK; /* playlist_NodesPairCreate will check for it */
- playlist_NodesPairCreate( p_playlist, _( "Media Library" ),
- &p_playlist->p_ml_category,
- &p_playlist->p_ml_onelevel, false );
+ 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_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;
+ 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;
}
+ 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;;
+
/* Initial status */
pl_priv(p_playlist)->status.p_item = NULL;
- pl_priv(p_playlist)->status.p_node = p_playlist->p_local_onelevel;
+ 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;
- pl_priv(p_playlist)->b_auto_preparse = false;
- playlist_MLLoad( p_playlist );
- pl_priv(p_playlist)->b_auto_preparse = true;
+ 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;
+ }
vlc_object_set_destructor( p_playlist, playlist_Destructor );
playlist_private_t *p_sys = pl_priv(p_playlist);
assert( !p_sys->p_input );
- assert( !p_sys->p_input_ressource );
+ assert( !p_sys->p_input_resource );
assert( !p_sys->p_preparser );
assert( !p_sys->p_fetcher );
vlc_cond_destroy( &p_sys->signal );
+ vlc_mutex_destroy( &p_sys->lock );
+
+ /* 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( 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_sys->items_to_delete );
+
+ ARRAY_RESET( p_playlist->items );
+ ARRAY_RESET( p_playlist->current );
+
msg_Dbg( p_this, "Destroyed" );
}
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 = 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, "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 );
var_Create( p_playlist, "album-art", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
}
-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 )
{
+ 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;
}
+
projects / vlc / blobdiff