diff options
author | Nick Peskett <rockbox@peskett.co.uk> | 2012-03-19 09:56:38 +0000 |
---|---|---|
committer | Nick Peskett <rockbox@peskett.co.uk> | 2012-03-19 11:49:55 +0100 |
commit | be10817e1c09d5a41710435cf6d58deb6dde9301 (patch) | |
tree | 4635fcb1ab51d2ef6dc1db28db045c369cf1abaf /apps/menus | |
parent | 69978d7046cd7e537c5079a5e306d22621a1767a (diff) | |
download | rockbox-be10817e1c09d5a41710435cf6d58deb6dde9301.tar.gz rockbox-be10817e1c09d5a41710435cf6d58deb6dde9301.zip |
Option to constrain get_next_dir() to directories below global_settings.start_directory.
When enabled, if the user has set "Start File Browser Here" (config.cfg:
start directory) to anything other than root and "Auto-Change Directory"
is set to "Yes" or "Random", the directory returned when an auto change
is required will be constrained to the value of "start directory" or below.
Change-Id: Iaab773868c4cab5a54f6ae67bdb22e84642a9e4b
Reviewed-on: http://gerrit.rockbox.org/182
Reviewed-by: Nick Peskett <rockbox@peskett.co.uk>
Tested-by: Nick Peskett <rockbox@peskett.co.uk>
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/playback_menu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index d5b20d09f5..17b7e57d32 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -135,6 +135,8 @@ MENUITEM_SETTING(beep, &global_settings.beep ,NULL); | |||
135 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); | 135 | MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL); |
136 | #endif | 136 | #endif |
137 | MENUITEM_SETTING(next_folder, &global_settings.next_folder, NULL); | 137 | MENUITEM_SETTING(next_folder, &global_settings.next_folder, NULL); |
138 | MENUITEM_SETTING(constrain_next_folder, | ||
139 | &global_settings.constrain_next_folder, NULL); | ||
138 | static int audioscrobbler_callback(int action,const struct menu_item_ex *this_item) | 140 | static int audioscrobbler_callback(int action,const struct menu_item_ex *this_item) |
139 | { | 141 | { |
140 | (void)this_item; | 142 | (void)this_item; |
@@ -205,7 +207,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, | |||
205 | #ifdef HAVE_SPDIF_POWER | 207 | #ifdef HAVE_SPDIF_POWER |
206 | &spdif_enable, | 208 | &spdif_enable, |
207 | #endif | 209 | #endif |
208 | &next_folder, &audioscrobbler, &cuesheet | 210 | &next_folder, &constrain_next_folder, &audioscrobbler, &cuesheet |
209 | #ifdef HAVE_HEADPHONE_DETECTION | 211 | #ifdef HAVE_HEADPHONE_DETECTION |
210 | ,&unplug_menu | 212 | ,&unplug_menu |
211 | #endif | 213 | #endif |