playlist: b_tree is private.

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index c170b223deae9d758c423b162d5a26f9d78cd30f..e83f4c3c2e3a9d36a9207ae3aa836d551dc490ed 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -177,8 +177,6 @@ struct playlist_t
     playlist_item_t *     p_local_onelevel; /** < "Playlist" in ONELEVEL view */
     playlist_item_t *     p_ml_onelevel; /** < "Library" in ONELEVEL view */
 
-    bool                  b_tree; /**< Display as a tree */
-
     bool            b_doing_ml; /**< Doing media library stuff,
                                        * get quicker */
     bool            b_auto_preparse;

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 4eae3faadb43c19198ef8c8d1771bbdb42d6ac1a..0dcbd93f198aa3df4036a8b4a25637740b462dea 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -94,7 +94,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     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;
 

diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h
index 1bcd850b8df5f19cd3ec516dc7b8dd8963e659b7..69ad4cebf292bf9599ef4d09f3304dfc384cbbe2 100644 (file)
--- a/src/playlist/playlist_internal.h
+++ b/src/playlist/playlist_internal.h
@@ -101,6 +101,8 @@ typedef struct playlist_private_t
         vlc_mutex_t         lock;     /**< Lock to protect request */
     } request;
 
+    bool                  b_tree; /**< Display as a tree */
+
 } playlist_private_t;
 
 #define pl_priv( pl ) ((playlist_private_t *)(pl))

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 4f7f7f2479135c52b8d8c05bddce8f28af494a75..b5e4e11e86b29b3bc9d55b4879c0ecdf8331c40b 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -336,7 +336,7 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
     int i;
     if( p_node->p_parent == p_playlist->p_root_category )
     {
-        if( p_playlist->b_tree || p_node->p_input->b_prefers_tree )
+        if( pl_priv(p_playlist)->b_tree || p_node->p_input->b_prefers_tree )
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ )
         {
@@ -347,7 +347,7 @@ playlist_item_t * playlist_GetPreferredNode( playlist_t *p_playlist,
     }
     else if( p_node->p_parent == p_playlist->p_root_onelevel )
     {
-        if( !p_playlist->b_tree || !p_node->p_input->b_prefers_tree )
+        if( !pl_priv(p_playlist)->b_tree || !p_node->p_input->b_prefers_tree )
             return p_node;
         for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ )
         {