diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-04-20 04:06:13 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2013-04-22 20:38:17 -0400 |
commit | e61e9c61d0ba6990576d59efca07afa13fd97566 (patch) | |
tree | 4b17b22dd4f56568666e25292f38224529ec7113 /firmware/drivers/audio/dummy_codec.c | |
parent | 91b33d5a3e92d62cf6fb6be875437d35b632caf5 (diff) | |
download | rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.tar.gz rockbox-e61e9c61d0ba6990576d59efca07afa13fd97566.zip |
Do some cleanup, adjustment and a couple fixes to recent sound changes.
* SOUND_x enum can be generated by audiohw_settings.h along with settings
entries and sound_val2phys.
* VOLUME_MIN and VOLUME_MAX are no longer necessary within sound.c. If
you need them, they are for target-defined purposes.
* Fix up SDL volume implementation in sdl.c. Move sim volume calculation
code to pcm-sdl.c.
* Min trigger tresholds were based upon VOLUME_MIN for some reason.
These setting have nothing to do with playback volume. Since it is no
longer present, set these at -89dB which is the minimum peak meter
sensitivity setting.
* Fix an oversight in wm8758.c. I forgot to add the dB->register
conversion to audiohw_set_volume.
Change-Id: Ie1df33f1793eee75e6793f16bc7bddd16edb7f75
Diffstat (limited to 'firmware/drivers/audio/dummy_codec.c')
-rw-r--r-- | firmware/drivers/audio/dummy_codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/audio/dummy_codec.c b/firmware/drivers/audio/dummy_codec.c index 3e73137eb9..fbbe836499 100644 --- a/firmware/drivers/audio/dummy_codec.c +++ b/firmware/drivers/audio/dummy_codec.c | |||
@@ -40,9 +40,9 @@ void audiohw_set_frequency(int fsel) | |||
40 | #ifdef HAVE_SW_VOLUME_CONTROL | 40 | #ifdef HAVE_SW_VOLUME_CONTROL |
41 | void audiohw_set_volume(int vol_l, int vol_r) | 41 | void audiohw_set_volume(int vol_l, int vol_r) |
42 | { | 42 | { |
43 | /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */ | 43 | /* SW volume for <= 1.0 gain, HW at unity, <= DUMMY_VOLUME_MIN == MUTE */ |
44 | int sw_volume_l = vol_l < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_l, 0); | 44 | int sw_volume_l = vol_l <= DUMMY_VOLUME_MIN ? PCM_MUTE_LEVEL : vol_l; |
45 | int sw_volume_r = vol_r < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_r, 0); | 45 | int sw_volume_r = vol_r <= DUMMY_VOLUME_MIN ? PCM_MUTE_LEVEL : vol_r; |
46 | pcm_set_master_volume(sw_volume_l, sw_volume_r); | 46 | pcm_set_master_volume(sw_volume_l, sw_volume_r); |
47 | } | 47 | } |
48 | #endif /* HAVE_SW_VOLUME_CONTROL */ | 48 | #endif /* HAVE_SW_VOLUME_CONTROL */ |