From ae12ec721feae467f6715c5d958ad23faea41f59 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 10 Mar 2003 14:07:36 +0000 Subject: Added new channels modes and invert setting in cfg-loader. Patch by Christian Determann. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3406 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 13 +++++++++---- docs/CUSTOM_CFG_FORMAT | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/settings.c b/apps/settings.c index a99d7244d4..39ec4086dc 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -878,9 +878,10 @@ bool settings_load_config(char* file) set_sound(value, SOUND_BALANCE, &global_settings.balance); else if (!strcasecmp(name, "channels")) { static char* options[] = { - "stereo","mono","mono left","mono right"}; + "stereo","stereo narrow","mono","mono left", + "mono right","karaoke","stereo wide"}; set_cfg_option(&global_settings.channel_config, value, - options, 4); + options, 7); } else if (!strcasecmp(name, "wps")) { if (wps_load(value,false)) @@ -941,6 +942,8 @@ bool settings_load_config(char* file) } else if (!strcasecmp(name, "scrollbar")) set_cfg_bool(&global_settings.scrollbar, value); + else if (!strcasecmp(name, "invert")) + set_cfg_bool(&global_settings.invert, value); #endif else if (!strcasecmp(name, "shuffle")) set_cfg_bool(&global_settings.playlist_shuffle, value); @@ -1000,8 +1003,10 @@ bool settings_load_config(char* file) set_sound(value, SOUND_LOUDNESS, &global_settings.loudness); else if (!strcasecmp(name, "bass boost")) set_sound(value, SOUND_SUPERBASS, &global_settings.bass_boost); - else if (!strcasecmp(name, "auto volume")) - set_sound(value, SOUND_AVC, &global_settings.avc); + else if (!strcasecmp(name, "auto volume")) { + static char* options[] = {"off", "2", "4", "8" }; + set_cfg_option(&global_settings.avc, value, options, 4); + } else if (!strcasecmp(name, "rec mic gain")) set_sound(value, SOUND_MIC_GAIN, &global_settings.rec_mic_gain); else if (!strcasecmp(name, "rec left gain")) diff --git a/docs/CUSTOM_CFG_FORMAT b/docs/CUSTOM_CFG_FORMAT index 9ce9daafe7..26d57e7c7c 100644 --- a/docs/CUSTOM_CFG_FORMAT +++ b/docs/CUSTOM_CFG_FORMAT @@ -18,7 +18,8 @@ volume (0 - 100) bass (-15 - 15) treble (-15 - 15) balance (-100 - 100) -channels (stereo, mono, mono left, mono right) +channels (stereo, stereo narrow, stereo wide, + mono, mono left, mono right, karaoke) shuffle (on, off) repeat (off, all, one) @@ -54,7 +55,7 @@ Recorder-specific settings (allowed values) [unit] --------------------------------------------------- loudness (0 - 17) bass boost (0 - 100) -auto volume (0=off, 1=2s, 2=4s, 3=8s) +auto volume (off, 2, 4, 8) [seconds] peak meter release (1 - 126) peak meter hold (off, 200ms, 300ms, 500ms, @@ -74,6 +75,7 @@ volume display (graphic, numeric) battery display (graphic, numeric) time format (12hour, 24hour) font (/path/filename.fnt) +invert (on, off) deep discharge (on, off) trickle charge (on, off) -- cgit v1.2.3