From e61e9c61d0ba6990576d59efca07afa13fd97566 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sat, 20 Apr 2013 04:06:13 -0400 Subject: 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 --- firmware/drivers/audio/dummy_codec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/drivers/audio/dummy_codec.c') 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) #ifdef HAVE_SW_VOLUME_CONTROL void audiohw_set_volume(int vol_l, int vol_r) { - /* SW volume for <= 1.0 gain, HW at unity, < VOLUME_MIN == MUTE */ - int sw_volume_l = vol_l < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_l, 0); - int sw_volume_r = vol_r < VOLUME_MIN ? PCM_MUTE_LEVEL : MIN(vol_r, 0); + /* SW volume for <= 1.0 gain, HW at unity, <= DUMMY_VOLUME_MIN == MUTE */ + int sw_volume_l = vol_l <= DUMMY_VOLUME_MIN ? PCM_MUTE_LEVEL : vol_l; + int sw_volume_r = vol_r <= DUMMY_VOLUME_MIN ? PCM_MUTE_LEVEL : vol_r; pcm_set_master_volume(sw_volume_l, sw_volume_r); } #endif /* HAVE_SW_VOLUME_CONTROL */ -- cgit v1.2.3