From 1df015beff013d3fae00a4fae905ef28c4df10ce Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Sun, 28 Sep 2008 16:36:01 +0200 Subject: [PATCH] playlist: b_tree is private. --- include/vlc_playlist.h | 2 -- src/playlist/engine.c | 2 +- src/playlist/playlist_internal.h | 2 ++ src/playlist/tree.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index c170b223de..e83f4c3c2e 100644 --- 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 4eae3faadb..0dcbd93f19 100644 --- 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 1bcd850b8d..69ad4cebf2 100644 --- 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 4f7f7f2479..b5e4e11e86 100644 --- 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++ ) { -- 2.39.2