openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

two audio fixes and one gtk message fix. 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJd1mEwAAoJEEy22O7T6HE4KV8P/3P/5cD+UWAXOk2wYUjMGxDH
 H7rBMHNorDmFldhJll+2h4HgVFyvNINmNGMUE6D+wtWzTw0S58I4VnZWrUcWlPDQ
 vNjCl+cY0uU1dqjp9MSCg+4GZ4cUwncYniLexVleUrg7/w1HcFbveU1oZhXlbJkR
 w/T2iGB0FTyuEghN0DjTB+6LXGcL75Vl0vfV+Jyqhoi0lK8L/K2BcIn09VSV8lQl
 NsYWIajiUH+bVLwLcqpcBwHpxErEHHDYgOcJb4AyFhNWpKEmcqTz6goBaazRguVq
 bZQN0uJrHpe2Z4bYvkUOhJtrrpBaysR1XDBKlL+Rv+M5zTfM0OvH7juKfNDsfFQQ
 JJ4qn7a5EMxVm0TjJRNj0k7yKxJsVFaE+Z9/qm/fRnzLfG8DDOthgHsksNMnpEV3
 cn0Oe7l+khU1HJe4QzMbJ4vFNNGliAjmJW+ERc50glrjQTvWCabSJpnMVagkg7ur
 dcZXuJFtZnsle/wvRRdR+54pjl7CCRF1zN1bqiC2LP+uoJj6NEUZban8O21OeAwk
 vLNqCx5Oe7I+o9V0y4KYlT3faL4dIBAkCDVlxmAmCXbWZ5iy2LJZeexmQR4jMsx2
 bQv09QJfHpUxFmhEiZOe3pmxjwWug0fg1I70nYnIBFYRR/iGwxvzNSd8lQZZAdIl
 okyo/qUjcHbuTh5sq4cV
 =/JUE
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2019-11-21 12:46:07 +00:00
parent 7b5425318a c55c974486
commit 996970236c
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
audio/audio.c
View File

@ -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;
}

9
hw/display/xlnx_dp.c
View File

@ -394,13 +394,18 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
written = AUD_write(s->amixer_output_stream,
&s->out_buffer[s->data_ptr], s->byte_left);
} else {
int len_to_copy;
/*
* There is nothing to play.. We don't have any data! Fill the
* buffer with zero's and send it.
*/
written = 0;
memset(s->out_buffer, 0, 1024);
AUD_write(s->amixer_output_stream, s->out_buffer, 1024);
while (avail) {
len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
memset(s->out_buffer, 0, len_to_copy);
avail -= AUD_write(s->amixer_output_stream, s->out_buffer,
len_to_copy);
}
}
} else {
written = AUD_write(s->amixer_output_stream,

2
po/zh_CN.po
View File

@ -66,7 +66,7 @@ msgid "Detach Tab"
msgstr "分离标签页"
msgid "Show Menubar"
msgstr ""
msgstr "显示菜单栏"
msgid "_Machine"
msgstr "虚拟机(_M)"

1
ui/gtk.c
View File

@ -2215,6 +2215,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
setlocale(LC_MESSAGES, "");
setlocale(LC_CTYPE, "C.UTF-8");
bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
bind_textdomain_codeset("qemu", "UTF-8");
textdomain("qemu");
window_display = gtk_widget_get_display(s->window);