summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-06-16 21:20:00 +0000
committerJens Arnold <amiconn@rockbox.org>2005-06-16 21:20:00 +0000
commit17f6d65da5646a26194d3de373578339f283f152 (patch)
tree248d24a0ffb2f5f09bc00f0d8bf6b31f3a56a84b
parent3828c7d98202edf885faa978e928760576666a6a (diff)
downloadrockbox-17f6d65da5646a26194d3de373578339f283f152.zip
rockbox-17f6d65da5646a26194d3de373578339f283f152.tar.gz
rockbox-17f6d65da5646a26194d3de373578339f283f152.tar.bz2
rockbox-17f6d65da5646a26194d3de373578339f283f152.tar.xz
Adjusted settings bitfield to properly keep the bass setting on H1x0, and save some bits on treble. Bumped config block version, so save your settings to a file before upgrading.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6731 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 312a40e..ea664a1 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -76,7 +76,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
#include "pcm_playback.h"
#endif
-#define CONFIG_BLOCK_VERSION 21
+#define CONFIG_BLOCK_VERSION 22
#define CONFIG_BLOCK_SIZE 512
#define RTC_BLOCK_SIZE 44
@@ -181,8 +181,13 @@ static const struct bit_entry rtc_bits[] =
/* sound */
{7, S_O(volume), 70, "volume", NULL }, /* 0...100 */
{8 | SIGNED, S_O(balance), 0, "balance", NULL }, /* -100...100 */
+#if CONFIG_HWCODEC != MASNONE /* any MAS */
{5 | SIGNED, S_O(bass), 0, "bass", NULL }, /* -15..+15 / -12..+12 */
{5 | SIGNED, S_O(treble), 0, "treble", NULL }, /* -15..+15 / -12..+12 */
+#elif defined HAVE_UDA1380
+ {5, S_O(bass), 0, "bass", NULL }, /* 0..+24 */
+ {3, S_O(treble), 0, "treble", NULL }, /* 0..+6 */
+#endif
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
{5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */
{3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" },