summaryrefslogtreecommitdiffstats
path: root/apps/menus
diff options
context:
space:
mode:
authorNick Peskett <rockbox@peskett.co.uk>2012-03-19 09:56:38 +0000
committerNick Peskett <rockbox@peskett.co.uk>2012-03-19 11:49:55 +0100
commitbe10817e1c09d5a41710435cf6d58deb6dde9301 (patch)
tree4635fcb1ab51d2ef6dc1db28db045c369cf1abaf /apps/menus
parent69978d7046cd7e537c5079a5e306d22621a1767a (diff)
downloadrockbox-be10817e1c09d5a41710435cf6d58deb6dde9301.tar.gz
rockbox-be10817e1c09d5a41710435cf6d58deb6dde9301.tar.bz2
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.c4
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);
MENUITEM_SETTING(spdif_enable, &global_settings.spdif_enable, NULL);
#endif
MENUITEM_SETTING(next_folder, &global_settings.next_folder, NULL);
+MENUITEM_SETTING(constrain_next_folder,
+ &global_settings.constrain_next_folder, NULL);
static int audioscrobbler_callback(int action,const struct menu_item_ex *this_item)
{
(void)this_item;
@@ -205,7 +207,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
#ifdef HAVE_SPDIF_POWER
&spdif_enable,
#endif
- &next_folder, &audioscrobbler, &cuesheet
+ &next_folder, &constrain_next_folder, &audioscrobbler, &cuesheet
#ifdef HAVE_HEADPHONE_DETECTION
,&unplug_menu
#endif