diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-21 12:46:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-21 12:46:07 +0000 |
| commit | 996970236c00f244ed9518238fef480725a40ff2 (patch) | |
| tree | 43d1015444a71caa6b2efc4c77de4fa43a438cb9 /audio | |
| parent | 7b5425318a27d0a41c1008a36c502719255b8f5e (diff) | |
| parent | c55c974486b0dadf97fe47e2e789d5dba9b77138 (diff) | |
| download | qemu-996970236c00f244ed9518238fef480725a40ff2.zip qemu-996970236c00f244ed9518238fef480725a40ff2.tar.gz qemu-996970236c00f244ed9518238fef480725a40ff2.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20191121-pull-request' into staging
two audio fixes and one gtk message fix.
# gpg: Signature made Thu 21 Nov 2019 10:04:32 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20191121-pull-request:
ui/gtk: fix gettext message's charset.
display: xlnx_dp: Provide sufficient bytes for silent audio channel
audio: fix audio recording
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/audio/audio.c b/audio/audio.c index 7fc3aa9..56fae55 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1390,6 +1390,7 @@ void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size) size_t read = hw->pcm_ops->read(hw, hw->buf_emul + hw->pos_emul, read_len); hw->pending_emul += read; + hw->pos_emul = (hw->pos_emul + read) % hw->size_emul; if (read < read_len) { break; } |