diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-04-17 14:32:36 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2012-04-17 16:57:57 +0400 |
| commit | c01b2456238f73964876471452e27d4aad7900fb (patch) | |
| tree | 828e8798ffc13fac2972657332fdc9bccd7ee965 /audio/audio.c | |
| parent | 6c95ab94f9f7e8d3156e4e16ecc7c499e141bb1a (diff) | |
audio: don't apply volume effect if backend has VOICE_VOLUME_CAP
If the audio backend is capable of volume control, don't apply
software volume (mixeng_volume ()), but instead, rely on backend
volume control. This will allow guest to have full range volume
control.
Signed-off-by: Marc-Andr? Lureau <marcandre.lureau@redhat.com>
Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'audio/audio.c')
| -rw-r--r-- | audio/audio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/audio/audio.c b/audio/audio.c index d76c342dcf..bd9237e9d3 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -957,7 +957,9 @@ int audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int size) total += isamp; } - mixeng_volume (sw->buf, ret, &sw->vol); + if (!(hw->ctl_caps & VOICE_VOLUME_CAP)) { + mixeng_volume (sw->buf, ret, &sw->vol); + } sw->clip (buf, sw->buf, ret); sw->total_hw_samples_acquired += total; @@ -1041,7 +1043,10 @@ int audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int size) swlim = audio_MIN (swlim, samples); if (swlim) { sw->conv (sw->buf, buf, swlim); - mixeng_volume (sw->buf, swlim, &sw->vol); + + if (!(sw->hw->ctl_caps & VOICE_VOLUME_CAP)) { + mixeng_volume (sw->buf, swlim, &sw->vol); + } } while (swlim) { |