summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2003-02-25 19:12:14 +0000
committerBjörn Stenberg <bjorn@haxx.se>2003-02-25 19:12:14 +0000
commitf40e366950ff8e54c34f2344a1a416371c7446bb (patch)
tree2a7a42abf76d937b6699aa0d76313ebab2fe9381
parent3b66990c2e54971fe552585d043c2f335c00bc08 (diff)
downloadrockbox-f40e366950ff8e54c34f2344a1a416371c7446bb.zip
rockbox-f40e366950ff8e54c34f2344a1a416371c7446bb.tar.gz
rockbox-f40e366950ff8e54c34f2344a1a416371c7446bb.tar.bz2
rockbox-f40e366950ff8e54c34f2344a1a416371c7446bb.tar.xz
Fixed bad backlight and peak meter value list (Henrik Backe)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3337 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings.c9
-rw-r--r--docs/CUSTOM_CFG_FORMAT7
2 files changed, 7 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 2599a11..2bb2e97 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -902,10 +902,9 @@ bool settings_load_config(char* file)
static char* options[] = {
"off","200ms","300ms","500ms",
"1","2","3","4","5","6","7","8","9","10",
- "15","20","25","30","45","60","90",
- "2min","3min","5min","10min","20min","45min","90min"};
+ "15","20","30","1min"};
set_cfg_option(&global_settings.peak_meter_hold, value,
- options, 28);
+ options, 18);
}
else if (!strcasecmp(name, "peak meter clip hold")) {
static char* options[] = {
@@ -977,9 +976,9 @@ bool settings_load_config(char* file)
else if (!strcasecmp(name, "backlight timeout")) {
static char* options[] = {
"off","on","1","2","3","4","5","6","7","8","9",
- "10","15","20","30","45","60","90"};
+ "10","15","20","25","30","45","60","90"};
set_cfg_option(&global_settings.backlight_timeout, value,
- options, 18);
+ options, 19);
}
else if (!strcasecmp(name, "backlight when plugged"))
set_cfg_bool(&global_settings.backlight_on_when_charging, value);
diff --git a/docs/CUSTOM_CFG_FORMAT b/docs/CUSTOM_CFG_FORMAT
index 9f05726..9ce9daa 100644
--- a/docs/CUSTOM_CFG_FORMAT
+++ b/docs/CUSTOM_CFG_FORMAT
@@ -34,12 +34,12 @@ show files (all, supported, music, playlists)
follow playlist (on, off)
scroll speed (1 - 10) [Hz]
-start delay (0 - 250) [1/10s]
+scroll delay (0 - 250) [1/10s]
scroll step (1 - 112) [pixels]
bidir limit (0 - 200) [% of screen width]
contrast (0 - 63)
backlight timeout (off, on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 15, 20, 30, 45, 60, 90) [seconds]
+ 15, 20, 25, 30, 45, 60, 90) [seconds]
backlight when plugged (on, off)
disk spindown (3 - 254) [seconds]
@@ -59,8 +59,7 @@ auto volume (0=off, 1=2s, 2=4s, 3=8s)
peak meter release (1 - 126)
peak meter hold (off, 200ms, 300ms, 500ms,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- 15, 20, 25, 30, 45, 90,
- 2min, 3min, 5min, 10min, 20min, 45min, 90min)
+ 15, 20, 30, 1min)
peak meter clip hold (on, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
15, 20, 25, 30, 45, 60, 90,
2min, 3min, 5min, 10min, 20min, 45min, 90min)