summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorAnton Oleynikov <len0x@rockbox.org>2005-12-04 14:33:10 +0000
committerAnton Oleynikov <len0x@rockbox.org>2005-12-04 14:33:10 +0000
commit2654d91aebb50453a52bba7de5bd0ec5ebcdfdd3 (patch)
treed0b0e635e132c7b86f9d3e04e6a4594f87da0bde /apps/settings.c
parent5009c9c1b82493421b6cec0fdf8b4f54ec4ff02c (diff)
downloadrockbox-2654d91aebb50453a52bba7de5bd0ec5ebcdfdd3.tar.gz
rockbox-2654d91aebb50453a52bba7de5bd0ec5ebcdfdd3.zip
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
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c11
1 files changed, 10 insertions, 1 deletions
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;
85#include "dsp.h" 85#include "dsp.h"
86#endif 86#endif
87 87
88#define CONFIG_BLOCK_VERSION 33 88#define CONFIG_BLOCK_VERSION 34
89#define CONFIG_BLOCK_SIZE 512 89#define CONFIG_BLOCK_SIZE 512
90#define RTC_BLOCK_SIZE 44 90#define RTC_BLOCK_SIZE 44
91 91
@@ -210,6 +210,9 @@ static const struct bit_entry rtc_bits[] =
210 {3, S_O(channel_config), 0, "channels", 210 {3, S_O(channel_config), 0, "channels",
211 "stereo,mono,custom,mono left,mono right,karaoke" }, 211 "stereo,mono,custom,mono left,mono right,karaoke" },
212 {8, S_O(stereo_width), 100, "stereo width", NULL}, 212 {8, S_O(stereo_width), 100, "stereo width", NULL},
213#ifdef HAVE_UDA1380
214 {2, S_O(sound_scaling), SOUND_SCALE_VOLUME, "prevent clipping", "adjust volume,adjust bass,adjust current,off"},
215#endif
213 /* playback */ 216 /* playback */
214 {1, S_O(resume), false, "resume", off_on }, 217 {1, S_O(resume), false, "resume", off_on },
215 {1, S_O(playlist_shuffle), false, "shuffle", off_on }, 218 {1, S_O(playlist_shuffle), false, "shuffle", off_on },
@@ -836,6 +839,9 @@ void sound_settings_apply(void)
836 sound_set(SOUND_VOLUME, global_settings.volume); 839 sound_set(SOUND_VOLUME, global_settings.volume);
837 sound_set(SOUND_CHANNELS, global_settings.channel_config); 840 sound_set(SOUND_CHANNELS, global_settings.channel_config);
838 sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width); 841 sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width);
842#ifdef HAVE_UDA1380
843 sound_set(SOUND_SCALING, global_settings.sound_scaling);
844#endif
839#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 845#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
840 sound_set(SOUND_LOUDNESS, global_settings.loudness); 846 sound_set(SOUND_LOUDNESS, global_settings.loudness);
841 sound_set(SOUND_AVC, global_settings.avc); 847 sound_set(SOUND_AVC, global_settings.avc);
@@ -1415,6 +1421,9 @@ void settings_reset(void) {
1415 global_settings.treble = sound_default(SOUND_TREBLE); 1421 global_settings.treble = sound_default(SOUND_TREBLE);
1416 global_settings.channel_config = sound_default(SOUND_CHANNELS); 1422 global_settings.channel_config = sound_default(SOUND_CHANNELS);
1417 global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH); 1423 global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH);
1424#ifdef HAVE_UDA1380
1425 global_settings.sound_scaling = sound_default(SOUND_SCALING);
1426#endif
1418#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 1427#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
1419 global_settings.loudness = sound_default(SOUND_LOUDNESS); 1428 global_settings.loudness = sound_default(SOUND_LOUDNESS);
1420 global_settings.avc = sound_default(SOUND_AVC); 1429 global_settings.avc = sound_default(SOUND_AVC);