From 1f26dd3fc7a3a285a00e5e84db113ae4b496da5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Tue, 22 Apr 2008 19:42:44 +0200 Subject: [PATCH] Remove unused option: b_prefers_tree --- include/vlc_input.h | 1 - src/input/item.c | 1 - src/playlist/tree.c | 6 +++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 1bdc3f25e3..edbd83dc99 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -72,7 +72,6 @@ struct input_item_t mtime_t i_duration; /**< Duration in milliseconds*/ uint8_t i_type; /**< Type (file, disc, ...) */ - bool b_prefers_tree; /**< Do we prefer being displayed as tree*/ int i_categories; /**< Number of info categories */ info_category_t **pp_categories; /**< Pointer to the first info category */ diff --git a/src/input/item.c b/src/input/item.c index da519e9c53..cfca9467f4 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -352,7 +352,6 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, p_input->psz_uri = NULL; p_input->i_type = i_type; - p_input->b_prefers_tree = false; if( p_input->i_type == ITEM_TYPE_UNKNOWN ) GuessType( p_input ); diff --git a/src/playlist/tree.c b/src/playlist/tree.c index 49d0776307..d4c8c49a50 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -329,8 +329,8 @@ 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_always_tree || - p_node->p_input->b_prefers_tree ) return p_node; + if( p_playlist->b_always_tree ) + return p_node; for( i = 0 ; i< p_playlist->p_root_onelevel->i_children; i++ ) { if( p_playlist->p_root_onelevel->pp_children[i]->p_input->i_id == @@ -340,7 +340,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_never_tree || !p_node->p_input->b_prefers_tree ) + if( p_playlist->b_never_tree ) return p_node; for( i = 0 ; i< p_playlist->p_root_category->i_children; i++ ) { -- 2.39.5