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/ossaudio.c | |
| parent | 0f136d9e060ad879d0b840274ddfd1955e24fc10 (diff) | |
| download | hqemu-00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9.zip hqemu-00e076795f2d6dfa0c078ff5d5ee5d77190cb4b9.tar.gz | |
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/ossaudio.c')
| -rw-r--r-- | audio/ossaudio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/ossaudio.c b/audio/ossaudio.c index d7a55e5..b49e102 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -788,8 +788,7 @@ static int oss_run_in (HWVoiceIn *hw) hw->info.align + 1); } read_samples += nread >> hwshift; - hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift, - &nominal_volume); + hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift); } if (bufs[i].len - nread) { |
