diff options
| author | Michael Walle <michael@walle.cc> | 2011-01-05 01:05:47 +0100 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-01-12 18:36:22 +0300 |
| commit | 00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9 (patch) | |
| tree | 125088eea53cc55083a5b69e927937b89db22645 /audio/winwaveaudio.c | |
| parent | 0f136d9e060ad879d0b840274ddfd1955e24fc10 (diff) | |
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 <michael@walle.cc>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'audio/winwaveaudio.c')
| -rw-r--r-- | audio/winwaveaudio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c index cdf483b89..e5ad3c660 100644 --- a/audio/winwaveaudio.c +++ b/audio/winwaveaudio.c @@ -581,8 +581,7 @@ static int winwave_run_in (HWVoiceIn *hw) int conv = audio_MIN (left, decr); hw->conv (hw->conv_buf + hw->wpos, advance (wave->pcm_buf, wave->rpos << hw->info.shift), - conv, - &nominal_volume); + conv); wave->rpos = (wave->rpos + conv) % hw->samples; hw->wpos = (hw->wpos + conv) % hw->samples; |