Commit 99697023 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7b542531 c55c9744

audio/audio.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }

hw/display/xlnx_dp.c

+7 −2
Original line number Diff line number Diff line
@@ -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,

po/zh_CN.po

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ msgid "Detach Tab" 
msgstr "分离标签页"



msgid "Show Menubar"

msgstr ""

msgstr "显示菜单栏"



msgid "_Machine"

msgstr "虚拟机(_M)"

ui/gtk.c

+1 −0
Original line number Diff line number Diff line
@@ -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);