iRiver: new sound option "prevent clipping:adjust volume/adjust bass/adjust current/off"

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8145 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 61 insertions, 1 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 40b84bbeab..502348def2 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3466,3 +3466,33 @@ desc: in radio screen / menu
 eng: "Mode:"
 voice: ""
 new:
+
+id: LANG_SCALING_MODE
+desc: in sound_settings. How to scale volume/bass to prevent clipping
+eng: "Prevent clipping"
+voice: "Prevent clipping"
+new:
+
+id: LANG_SCALE_OFF
+desc: in sound_settings. Do not reduce volume/bass
+eng: "Off"
+voice: "Off"
+new:
+
+id: LANG_SCALE_VOLUME
+desc: in sound_settings. Reduce volume
+eng: "Adjust volume"
+voice: "Adjust volume"
+new:
+
+id: LANG_SCALE_BASS
+desc: in sound_settings. Reduce bass
+eng: "Adjust bass"
+voice: "Adjust bass"
+new:
+
+id: LANG_SCALE_CURRENT
+desc: in sound_settings. Reduce other metric than currently modified
+eng: "Adjust current"
+voice: "Adjust current"
+new:
diff --git a/apps/settings.c b/apps/settings.c
index edcef4a271..302cf51e26 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -85,7 +85,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
 #include "dsp.h"
 #endif
 
-#define CONFIG_BLOCK_VERSION 33
+#define CONFIG_BLOCK_VERSION 34
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -210,6 +210,9 @@ static const struct bit_entry rtc_bits[] =
     {3, S_O(channel_config), 0, "channels",
         "stereo,mono,custom,mono left,mono right,karaoke" },
     {8, S_O(stereo_width), 100, "stereo width", NULL},
+#ifdef HAVE_UDA1380
+    {2, S_O(sound_scaling), SOUND_SCALE_VOLUME, "prevent clipping", "adjust volume,adjust bass,adjust current,off"},
+#endif
     /* playback */
     {1, S_O(resume), false, "resume", off_on },
     {1, S_O(playlist_shuffle), false, "shuffle", off_on },
@@ -836,6 +839,9 @@ void sound_settings_apply(void)
     sound_set(SOUND_VOLUME, global_settings.volume);
     sound_set(SOUND_CHANNELS, global_settings.channel_config);
     sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width);
+#ifdef HAVE_UDA1380
+    sound_set(SOUND_SCALING, global_settings.sound_scaling);
+#endif
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
     sound_set(SOUND_LOUDNESS, global_settings.loudness);
     sound_set(SOUND_AVC, global_settings.avc);
@@ -1415,6 +1421,9 @@ void settings_reset(void) {
     global_settings.treble      = sound_default(SOUND_TREBLE);
     global_settings.channel_config = sound_default(SOUND_CHANNELS);
     global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH);
+#ifdef HAVE_UDA1380
+    global_settings.sound_scaling = sound_default(SOUND_SCALING);
+#endif
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
     global_settings.loudness    = sound_default(SOUND_LOUDNESS);
     global_settings.avc         = sound_default(SOUND_AVC);
diff --git a/apps/settings.h b/apps/settings.h
index 958703396d..9f9cc63602 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -157,6 +157,9 @@ struct user_settings
     int avc;        /* auto volume correct:  0=off, 1=20ms, 2=2s 3=4s 4=8s   */
     int channel_config; /* Stereo, Mono, Custom, Mono left, Mono right, Karaoke */
     int stereo_width; /* 0-255% */
+#ifdef HAVE_UDA1380
+    int sound_scaling; /* Off, Volume, Bass, Current metric */
+#endif
     int mdb_strength; /* 0-127dB */
     int mdb_harmonics; /* 0-100% */
     int mdb_center; /* 20-300Hz */
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index d8795ab8ae..06887cf9d3 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -349,6 +349,21 @@ static bool stereo_width(void)
                      SOUND_STEREO_WIDTH);
 }
 
+#ifdef HAVE_UDA1380
+static bool sound_scaling(void)
+{
+    static const struct opt_items names[] = { 
+        { STR(LANG_SCALE_VOLUME) },
+        { STR(LANG_SCALE_BASS)   },
+        { STR(LANG_SCALE_CURRENT)},
+        { STR(LANG_SCALE_OFF) }
+    };
+
+    return set_option(str(LANG_SCALING_MODE), &global_settings.sound_scaling, INT,
+                      names, 4, sound_set_scaling);
+}
+#endif
+
 bool sound_menu(void)
 {
     int m;
@@ -360,6 +375,9 @@ bool sound_menu(void)
         { ID2P(LANG_BALANCE), balance },
         { ID2P(LANG_CHANNEL_MENU), chanconf },
         { ID2P(LANG_STEREO_WIDTH), stereo_width },
+#ifdef HAVE_UDA1380
+        { ID2P(LANG_SCALING_MODE), sound_scaling },
+#endif
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
         { ID2P(LANG_LOUDNESS), loudness },
         { ID2P(LANG_AUTOVOL), avc },