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/dsoundaudio.c | |
| parent | 0f136d9e060ad879d0b840274ddfd1955e24fc10 (diff) | |
| download | qemu-00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9.zip qemu-00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9.tar.gz qemu-00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9.tar.bz2 | |
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/dsoundaudio.c')
| -rw-r--r-- | audio/dsoundaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index e547955..e2d89fd 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -831,11 +831,11 @@ static int dsound_run_in (HWVoiceIn *hw) decr = len1 + len2; if (p1 && len1) { - 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); } dsound_unlock_in (dscb, p1, p2, blen1, blen2); |