diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-22 12:37:42 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-06-22 12:37:42 +0000 |
commit | 94da3b5f1d6bd8ea7bba41dee573895f23c04544 (patch) | |
tree | 14d2c743c6c3c4ec007a185c34781cef7a505630 | |
parent | 9830b164ef09277df433be37c2adafe3b078c3d4 (diff) | |
download | rockbox-94da3b5f1d6bd8ea7bba41dee573895f23c04544.tar.gz rockbox-94da3b5f1d6bd8ea7bba41dee573895f23c04544.zip |
Added the (practically useless) 20ms option to the Auto Volume setting, for completeness
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4793 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/sound_menu.c | 3 | ||||
-rw-r--r-- | firmware/mp3_playback.c | 11 |
4 files changed, 12 insertions, 8 deletions
diff --git a/apps/settings.c b/apps/settings.c index 36fcff3814..7d1d92fa97 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -71,7 +71,7 @@ char rockboxdir[] = ROCKBOX_DIR; /* config/font/data file directory */ | |||
71 | char rec_base_directory[] = REC_BASE_DIR; | 71 | char rec_base_directory[] = REC_BASE_DIR; |
72 | 72 | ||
73 | 73 | ||
74 | #define CONFIG_BLOCK_VERSION 12 | 74 | #define CONFIG_BLOCK_VERSION 13 |
75 | #define CONFIG_BLOCK_SIZE 512 | 75 | #define CONFIG_BLOCK_SIZE 512 |
76 | #define RTC_BLOCK_SIZE 44 | 76 | #define RTC_BLOCK_SIZE 44 |
77 | 77 | ||
@@ -166,7 +166,7 @@ static struct bit_entry rtc_bits[] = | |||
166 | #ifdef HAVE_MAS3587F | 166 | #ifdef HAVE_MAS3587F |
167 | {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */ | 167 | {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */ |
168 | {7, S_O(bass_boost), 0, "bass boost", NULL }, /* 0...100 */ | 168 | {7, S_O(bass_boost), 0, "bass boost", NULL }, /* 0...100 */ |
169 | {2, S_O(avc), 0, "auto volume", "off,2,4,8" }, | 169 | {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" }, |
170 | #endif | 170 | #endif |
171 | {3, S_O(channel_config), 6, "channels", | 171 | {3, S_O(channel_config), 6, "channels", |
172 | "stereo,stereo narrow,mono,mono left,mono right,karaoke,stereo wide" }, | 172 | "stereo,stereo narrow,mono,mono left,mono right,karaoke,stereo wide" }, |
diff --git a/apps/settings.h b/apps/settings.h index ddc3aca599..baea723e4b 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -72,7 +72,7 @@ struct user_settings | |||
72 | int treble; /* treble eq: 0-100 0=low 100=high */ | 72 | int treble; /* treble eq: 0-100 0=low 100=high */ |
73 | int loudness; /* loudness eq: 0-100 0=off 100=max */ | 73 | int loudness; /* loudness eq: 0-100 0=off 100=max */ |
74 | int bass_boost; /* bass boost eq: 0-100 0=off 100=max */ | 74 | int bass_boost; /* bass boost eq: 0-100 0=off 100=max */ |
75 | int avc; /* auto volume correct: 0=disable, 1=2s 2=4s 3=8s */ | 75 | int avc; /* auto volume correct: 0=off, 1=20ms, 2=2s 3=4s 4=8s */ |
76 | int channel_config; /* Stereo, Mono, Mono left, Mono right */ | 76 | int channel_config; /* Stereo, Mono, Mono left, Mono right */ |
77 | 77 | ||
78 | int rec_quality; /* 0-7 */ | 78 | int rec_quality; /* 0-7 */ |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index e41153c29b..4a6857d0cb 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -191,12 +191,13 @@ static bool avc(void) | |||
191 | { | 191 | { |
192 | struct opt_items names[] = { | 192 | struct opt_items names[] = { |
193 | { STR(LANG_OFF) }, | 193 | { STR(LANG_OFF) }, |
194 | { "20ms", TALK_ID(20, UNIT_MS) }, | ||
194 | { "2s", TALK_ID(2, UNIT_SEC) }, | 195 | { "2s", TALK_ID(2, UNIT_SEC) }, |
195 | { "4s", TALK_ID(4, UNIT_SEC) }, | 196 | { "4s", TALK_ID(4, UNIT_SEC) }, |
196 | { "8s", TALK_ID(8, UNIT_SEC) } | 197 | { "8s", TALK_ID(8, UNIT_SEC) } |
197 | }; | 198 | }; |
198 | return set_option(str(LANG_DECAY), &global_settings.avc, INT, | 199 | return set_option(str(LANG_DECAY), &global_settings.avc, INT, |
199 | names, 4, set_avc); | 200 | names, 5, set_avc); |
200 | } | 201 | } |
201 | 202 | ||
202 | static bool recsource(void) | 203 | static bool recsource(void) |
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index 28d14eae64..5d43458445 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c | |||
@@ -124,7 +124,7 @@ static int maxval[] = | |||
124 | 100, /* Balance */ | 124 | 100, /* Balance */ |
125 | 17, /* Loudness */ | 125 | 17, /* Loudness */ |
126 | 100, /* Bass boost */ | 126 | 100, /* Bass boost */ |
127 | 3, /* AVC */ | 127 | 4, /* AVC */ |
128 | 6, /* Channels */ | 128 | 6, /* Channels */ |
129 | 15, /* Left gain */ | 129 | 15, /* Left gain */ |
130 | 15, /* Right gain */ | 130 | 15, /* Right gain */ |
@@ -673,13 +673,16 @@ void mpeg_sound_set(int setting, int value) | |||
673 | 673 | ||
674 | case SOUND_AVC: | 674 | case SOUND_AVC: |
675 | switch (value) { | 675 | switch (value) { |
676 | case 1: /* 2s */ | 676 | case 1: /* 20ms */ |
677 | tmp = (0x1 << 8) | (0x8 << 12); | ||
678 | break; | ||
679 | case 2: /* 2s */ | ||
677 | tmp = (0x2 << 8) | (0x8 << 12); | 680 | tmp = (0x2 << 8) | (0x8 << 12); |
678 | break; | 681 | break; |
679 | case 2: /* 4s */ | 682 | case 3: /* 4s */ |
680 | tmp = (0x4 << 8) | (0x8 << 12); | 683 | tmp = (0x4 << 8) | (0x8 << 12); |
681 | break; | 684 | break; |
682 | case 3: /* 8s */ | 685 | case 4: /* 8s */ |
683 | tmp = (0x8 << 8) | (0x8 << 12); | 686 | tmp = (0x8 << 8) | (0x8 << 12); |
684 | break; | 687 | break; |
685 | case -1: /* turn off and then turn on again to decay quickly */ | 688 | case -1: /* turn off and then turn on again to decay quickly */ |