summaryrefslogtreecommitdiffstats
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-10-17 16:05:23 +0000
committerThomas Martitz <kugel@rockbox.org>2009-10-17 16:05:23 +0000
commita7c888c48ed65a49b81c44159c1293ea790c4acf (patch)
tree88087a95bd86099fd1e84d0236aa0ce7ec8d6953 /apps/settings_list.c
parent88b1efd92579248c4d17d1edf7a7b02041c0e003 (diff)
downloadrockbox-a7c888c48ed65a49b81c44159c1293ea790c4acf.tar.gz
rockbox-a7c888c48ed65a49b81c44159c1293ea790c4acf.tar.bz2
rockbox-a7c888c48ed65a49b81c44159c1293ea790c4acf.zip
Add a option to skip length which lets you skip 5s before the end of a song, which can be useful on gapless albums.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23229 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 62a9351782..27675ca0b8 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -291,7 +291,9 @@ static const char* formatter_unit_0_is_skip_track(char *buffer, size_t buffer_si
int val, const char *unit)
{
(void)unit;
- if (val == 0)
+ if (val == -1)
+ return str(LANG_SKIP_OUTRO);
+ else if (val == 0)
return str(LANG_SKIP_TRACK);
else if (val % 60 == 0)
snprintf(buffer, buffer_size, "%d min", val/60);
@@ -1459,10 +1461,10 @@ const struct settings_list settings[] = {
NULL),
TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, skip_length,
LANG_SKIP_LENGTH, 0, "skip length",
- "track,1s,2s,3s,5s,7s,10s,15s,20s,30s,45s,1min,90s,2min,3min,5min,10min,15min",
+ "outro,track,1s,2s,3s,5s,7s,10s,15s,20s,30s,45s,1min,90s,2min,3min,5min,10min,15min",
UNIT_SEC, formatter_unit_0_is_skip_track,
getlang_unit_0_is_skip_track, NULL,
- 18, 0,1,2,3,5,7,10,15,20,30,45,60,90,120,180,300,600,900),
+ 19, -1,0,1,2,3,5,7,10,15,20,30,45,60,90,120,180,300,600,900),
CHOICE_SETTING(0, start_in_screen, LANG_START_SCREEN, 1,
"start in screen", "previous,root,files,"
#ifdef HAVE_TAGCACHE