X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplaylist%2Fengine.c;h=6dab8e72e0926029d74d03cf3d51a983b06bc5a2;hb=0e996c7bd2aa92e857ac8c0a244675537b1e6454;hp=b6f82ed12a1b214dfa81c52b9c4c2cdb55c9df6d;hpb=6914f254c1c18fee1afd2cda6fdeb5a60a71e9dc;p=vlc

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index b6f82ed12a..6dab8e72e0 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -81,6 +81,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     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 */
@@ -96,12 +97,12 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     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,
@@ -128,7 +129,8 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
         !p_playlist->p_local_onelevel->p_input )
         return NULL;
 
-    if( config_GetInt( p_playlist, "media-library") )
+    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" ),
@@ -153,9 +155,13 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     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 );
 
@@ -176,11 +182,12 @@ static void playlist_Destructor( vlc_object_t * p_this )
     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 )
@@ -266,25 +273,19 @@ void set_current_status_node( playlist_t * p_playlist,
 
 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, "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 );
@@ -302,24 +303,17 @@ static void VariablesInit( playlist_t *p_playlist )
     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;
 }
+