diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-12-10 11:14:28 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-12-10 11:14:28 +0000 |
commit | df31f5f1869337cf3eb2dd456c566624e207ae00 (patch) | |
tree | b320df052db270de23d5e306ee9a815bc5f0abe1 /firmware/sound.c | |
parent | 0a0a78ec4bfd5c011bbebc7e662e419deca79b5a (diff) | |
download | rockbox-df31f5f1869337cf3eb2dd456c566624e207ae00.tar.gz rockbox-df31f5f1869337cf3eb2dd456c566624e207ae00.zip |
Revert previous commit (still learning to work with git...)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15904 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/sound.c')
-rw-r--r-- | firmware/sound.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 2dd5522e38..5a1a1e97b7 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -61,7 +61,7 @@ const struct sound_settings_info audiohw_settings[] = { | |||
61 | [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25}, | 61 | [SOUND_VOLUME] = {"dB", 0, 1, VOLUME_MIN / 10, VOLUME_MAX / 10, -25}, |
62 | [SOUND_BASS] = {"dB", 0, 1, -24, 24, 0}, | 62 | [SOUND_BASS] = {"dB", 0, 1, -24, 24, 0}, |
63 | [SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0}, | 63 | [SOUND_TREBLE] = {"dB", 0, 1, -24, 24, 0}, |
64 | [SOUND_BALANCE] = {"dB", 0, 1, VOLUME_RANGE / 10, -VOLUME_RANGE / 10, 0}, | 64 | [SOUND_BALANCE] = {"%", 0, 1,-100, 100, 0}, |
65 | [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, | 65 | [SOUND_CHANNELS] = {"", 0, 1, 0, 5, 0}, |
66 | [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, | 66 | [SOUND_STEREO_WIDTH] = {"%", 0, 5, 0, 250, 100}, |
67 | #if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)\ | 67 | #if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)\ |
@@ -418,13 +418,13 @@ void sound_set_balance(int value) | |||
418 | if(!audio_is_initialized) | 418 | if(!audio_is_initialized) |
419 | return; | 419 | return; |
420 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 420 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
421 | unsigned tmp = ((unsigned)(value) & 0xff) << 8; | 421 | unsigned tmp = ((unsigned)(value * 127 / 100) & 0xff) << 8; |
422 | mas_codec_writereg(0x11, tmp); | 422 | mas_codec_writereg(0x11, tmp); |
423 | #elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \ | 423 | #elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \ |
424 | || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ | 424 | || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ |
425 | || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751) \ | 425 | || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751) \ |
426 | || defined(HAVE_AS3514) | 426 | || defined(HAVE_AS3514) |
427 | current_balance = value * 10; /* tenth of dB */ | 427 | current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ |
428 | set_prescaled_volume(); | 428 | set_prescaled_volume(); |
429 | #elif CONFIG_CPU == PNX0101 | 429 | #elif CONFIG_CPU == PNX0101 |
430 | /* TODO: implement for iFP */ | 430 | /* TODO: implement for iFP */ |