mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
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
This commit is contained in:
parent
91b33d5a3e
commit
e61e9c61d0
43 changed files with 170 additions and 307 deletions
|
|
@ -273,9 +273,9 @@ void audiohw_init(void)
|
|||
void audiohw_set_volume(int vol_l, int vol_r)
|
||||
{
|
||||
#ifdef HAVE_SW_VOLUME_CONTROL
|
||||
/* 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, < -740 == MUTE */
|
||||
int sw_volume_l = vol_l <= -740 ? PCM_MUTE_LEVEL : MIN(vol_l, 0);
|
||||
int sw_volume_r = vol_r <= -740 ? PCM_MUTE_LEVEL : MIN(vol_r, 0);
|
||||
pcm_set_master_volume(sw_volume_l, sw_volume_r);
|
||||
#endif /* HAVE_SW_VOLUME_CONTROL */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue