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>

3 files changed, 13 insertions, 1 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 3db416ecfa..59148e15cc 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -145,6 +145,7 @@
     cuesheet support
                     & on, off           & N/A\\
     folder navigation & off, on, random & N/A\\
+    constrain next folder & off, on     & N/A\\
     gather runtime data & off, on       & N/A\\
     \opt{usb_charging_enable}{
       usb charging  & on, off, force    & N/A\\
diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex
index b3a5c82ee6..bfc2f5c87a 100644
--- a/manual/configure_rockbox/playback_options.tex
+++ b/manual/configure_rockbox/playback_options.tex
@@ -221,8 +221,15 @@ you to configure settings related to audio playback.
 
   \note{This feature only works when songs have been played from the file
     browser.  Using it with the database may cause unexpected behaviour.}
+  %
 
+\section{\label{ref:ConstrainAutoChange}Constrain Auto-Change}
+  If enabled and you have set \setting{Start File Browser Here} to a directory
+  other than root, \setting{Auto-Change Directory} will be constrained to the
+  directory you have chosen and those below it.
+  See \reference{ref:StartFileBrowserHere}.
   %
+
 \opt{headphone_detection}{
 \section{Pause on Headphone Unplug}
   Enables and disables automatic pausing of 
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index d0144c261d..37d8cb01ca 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -188,9 +188,13 @@ each option pertains both to files and directories):
   \item [Set As Recording Directory.]
     Save recordings in the selected directory.
 }
-\item [Start File Browser Here.]
+\item [\label{ref:StartFileBrowserHere}Start File Browser Here.]
   This option allows users to set the currently selected directory as the default
   start directory for the file browser. This option is not available for files.
+  \note{If you have \setting{Auto-Change Directory} and
+  \setting{Constrain Auto-Change} enabled, the directories returned will
+  be constrained to the directory you have chosen here and those below it.
+  See \reference{ref:ConstrainAutoChange}}
 \item [Add to Shortcuts.]
   Adds a link to the selected item in the \fname{shortcuts.link} file.
   If the file does not already exist it will be created in the root directory.