diff options
-rw-r--r-- | apps/filetree.c | 9 | ||||
-rw-r--r-- | apps/main_menu.c | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 10 | ||||
-rw-r--r-- | apps/tree.c | 3 | ||||
-rw-r--r-- | apps/tree.h | 3 |
5 files changed, 12 insertions, 15 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index e6ba08b96e..691a6adee6 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -218,8 +218,7 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
218 | (((len == 1) && | 218 | (((len == 1) && |
219 | (!strncmp(entry->d_name, ".", 1))) || | 219 | (!strncmp(entry->d_name, ".", 1))) || |
220 | ((len == 2) && | 220 | ((len == 2) && |
221 | (!strncmp(entry->d_name, "..", 2))) || | 221 | (!strncmp(entry->d_name, "..", 2))))) { |
222 | c->hidedirs)) { | ||
223 | i--; | 222 | i--; |
224 | continue; | 223 | continue; |
225 | } | 224 | } |
@@ -258,19 +257,19 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
258 | #endif | 257 | #endif |
259 | 258 | ||
260 | /* filter out non-visible files */ | 259 | /* filter out non-visible files */ |
261 | if (!(dptr->attr & ATTR_DIRECTORY) && ( | 260 | if ((!(dptr->attr & ATTR_DIRECTORY) && ( |
262 | (*c->dirfilter == SHOW_PLAYLIST && | 261 | (*c->dirfilter == SHOW_PLAYLIST && |
263 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || | 262 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || |
264 | ((*c->dirfilter == SHOW_MUSIC && | 263 | ((*c->dirfilter == SHOW_MUSIC && |
265 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MPA) && | 264 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MPA) && |
266 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || | 265 | (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_M3U) || |
267 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)) || | 266 | (*c->dirfilter == SHOW_SUPPORTED && !filetype_supported(dptr->attr)))) || |
268 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || | 267 | (*c->dirfilter == SHOW_WPS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_WPS) || |
269 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || | 268 | (*c->dirfilter == SHOW_CFG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_CFG) || |
270 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || | 269 | (*c->dirfilter == SHOW_LNG && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_LNG) || |
271 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || | 270 | (*c->dirfilter == SHOW_MOD && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_MOD) || |
272 | (*c->dirfilter == SHOW_FONT && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FONT) || | 271 | (*c->dirfilter == SHOW_FONT && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_FONT) || |
273 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK))) | 272 | (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & TREE_ATTR_MASK) != TREE_ATTR_ROCK)) |
274 | { | 273 | { |
275 | i--; | 274 | i--; |
276 | continue; | 275 | continue; |
diff --git a/apps/main_menu.c b/apps/main_menu.c index 3f8ecf9594..b887ed6504 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -303,7 +303,7 @@ bool show_info(void) | |||
303 | 303 | ||
304 | static bool plugin_browse(void) | 304 | static bool plugin_browse(void) |
305 | { | 305 | { |
306 | return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS, true); | 306 | return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS); |
307 | } | 307 | } |
308 | 308 | ||
309 | #ifdef HAVE_RECORDING | 309 | #ifdef HAVE_RECORDING |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index e2dda0ce8f..57b4cc897e 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1020,17 +1020,17 @@ static bool browse_current(void) | |||
1020 | 1020 | ||
1021 | static bool custom_wps_browse(void) | 1021 | static bool custom_wps_browse(void) |
1022 | { | 1022 | { |
1023 | return rockbox_browse(ROCKBOX_DIR, SHOW_WPS, true); | 1023 | return rockbox_browse(ROCKBOX_DIR, SHOW_WPS); |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | static bool custom_cfg_browse(void) | 1026 | static bool custom_cfg_browse(void) |
1027 | { | 1027 | { |
1028 | return rockbox_browse(ROCKBOX_DIR, SHOW_CFG, true); | 1028 | return rockbox_browse(ROCKBOX_DIR, SHOW_CFG); |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | static bool language_browse(void) | 1031 | static bool language_browse(void) |
1032 | { | 1032 | { |
1033 | return rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG, true); | 1033 | return rockbox_browse(ROCKBOX_DIR LANG_DIR, SHOW_LNG); |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | static bool voice_menus(void) | 1036 | static bool voice_menus(void) |
@@ -1092,7 +1092,7 @@ static bool voice_menu(void) | |||
1092 | #ifdef HAVE_LCD_BITMAP | 1092 | #ifdef HAVE_LCD_BITMAP |
1093 | static bool font_browse(void) | 1093 | static bool font_browse(void) |
1094 | { | 1094 | { |
1095 | return rockbox_browse(ROCKBOX_DIR FONT_DIR, SHOW_FONT, true); | 1095 | return rockbox_browse(ROCKBOX_DIR FONT_DIR, SHOW_FONT); |
1096 | } | 1096 | } |
1097 | 1097 | ||
1098 | static bool scroll_bar(void) | 1098 | static bool scroll_bar(void) |
@@ -1543,7 +1543,7 @@ static bool display_settings_menu(void) | |||
1543 | 1543 | ||
1544 | static bool firmware_browse(void) | 1544 | static bool firmware_browse(void) |
1545 | { | 1545 | { |
1546 | return rockbox_browse(ROCKBOX_DIR, SHOW_MOD, true); | 1546 | return rockbox_browse(ROCKBOX_DIR, SHOW_MOD); |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | static bool battery_settings_menu(void) | 1549 | static bool battery_settings_menu(void) |
diff --git a/apps/tree.c b/apps/tree.c index 1a7f1045f7..8e1afb8b67 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1447,7 +1447,7 @@ bool create_playlist(void) | |||
1447 | return true; | 1447 | return true; |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | bool rockbox_browse(const char *root, int dirfilter, bool hidedirs) | 1450 | bool rockbox_browse(const char *root, int dirfilter) |
1451 | { | 1451 | { |
1452 | static struct tree_context backup; | 1452 | static struct tree_context backup; |
1453 | 1453 | ||
@@ -1456,7 +1456,6 @@ bool rockbox_browse(const char *root, int dirfilter, bool hidedirs) | |||
1456 | memcpy(tc.currdir, root, sizeof(tc.currdir)); | 1456 | memcpy(tc.currdir, root, sizeof(tc.currdir)); |
1457 | start_wps = false; | 1457 | start_wps = false; |
1458 | tc.dirfilter = &dirfilter; | 1458 | tc.dirfilter = &dirfilter; |
1459 | tc.hidedirs = hidedirs; | ||
1460 | 1459 | ||
1461 | dirbrowse(); | 1460 | dirbrowse(); |
1462 | 1461 | ||
diff --git a/apps/tree.h b/apps/tree.h index 2e6b21dd3a..41ef0e527f 100644 --- a/apps/tree.h +++ b/apps/tree.h | |||
@@ -150,7 +150,6 @@ struct tree_context { | |||
150 | int cursorpos[MAX_DIR_LEVELS]; | 150 | int cursorpos[MAX_DIR_LEVELS]; |
151 | char currdir[MAX_PATH]; /* file use */ | 151 | char currdir[MAX_PATH]; /* file use */ |
152 | int *dirfilter; /* file use */ | 152 | int *dirfilter; /* file use */ |
153 | bool hidedirs; | ||
154 | int filesindir; | 153 | int filesindir; |
155 | int dirsindir; /* file use */ | 154 | int dirsindir; /* file use */ |
156 | int dirlength; /* total number of entries in dir, incl. those not loaded */ | 155 | int dirlength; /* total number of entries in dir, incl. those not loaded */ |
@@ -187,7 +186,7 @@ void tree_get_filetypes(const struct filetype**, int*); | |||
187 | void tree_init(void); | 186 | void tree_init(void); |
188 | void browse_root(void); | 187 | void browse_root(void); |
189 | void set_current_file(char *path); | 188 | void set_current_file(char *path); |
190 | bool rockbox_browse(const char *root, int dirfilter, bool hidedirs); | 189 | bool rockbox_browse(const char *root, int dirfilter); |
191 | bool create_playlist(void); | 190 | bool create_playlist(void); |
192 | void resume_directory(const char *dir); | 191 | void resume_directory(const char *dir); |
193 | char *getcwd(char *buf, int size); | 192 | char *getcwd(char *buf, int size); |