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/playback.c | |
| parent | 69978d7046cd7e537c5079a5e306d22621a1767a (diff) | |
| download | rockbox-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/playback.c')
| -rw-r--r-- | apps/playback.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/playback.c b/apps/playback.c index 8fe43eb884..28f664357c 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -2644,8 +2644,17 @@ static void audio_on_skip(void) skip_pending = TRACK_SKIP_NONE; /* Update the playlist current track now */ - while (playlist_next(playlist_delta) < 0) + int pl_retval; + while ((pl_retval = playlist_next(playlist_delta)) < 0) { + if (pl_retval < -1) + { + /* Some variety of fatal error while updating playlist */ + filling = STATE_ENDED; + audio_stop_playback(); + return; + } + /* Manual skip out of range (because the playlist wasn't updated yet by us and so the check in audio_skip returned 'ok') - bring back into range */ |