From 00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Wed, 5 Jan 2011 01:05:47 +0100 Subject: audio: split sample conversion and volume mixing Refactor the volume mixing, so it can be reused for capturing devices. Additionally, it removes superfluous multiplications with the nominal volume within the hardware voice code path. Signed-off-by: Michael Walle Signed-off-by: malc --- audio/fmodaudio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/fmodaudio.c') diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index 7f08e14..c34cf53 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -488,10 +488,10 @@ static int fmod_run_in (HWVoiceIn *hw) decr = len1 + len2; if (p1 && blen1) { - hw->conv (hw->conv_buf + hw->wpos, p1, len1, &nominal_volume); + hw->conv (hw->conv_buf + hw->wpos, p1, len1); } if (p2 && len2) { - hw->conv (hw->conv_buf, p2, len2, &nominal_volume); + hw->conv (hw->conv_buf, p2, len2); } fmod_unlock_sample (fmd->fmod_sample, p1, p2, blen1, blen2); -- cgit v1.1