summary refs log tree commit diff stats
path: root/ui/vnc.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-05-26 10:59:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-05-26 10:59:01 +0100
commit8f72c75cfc9b3c84a9b5e7a58ee5e471cb2f19c8 (patch)
tree01e4f31b2333d27d969322eb4cf9381733d817cc /ui/vnc.c
parentfea8f3ed739536fca027cf56af7f5576f37ef9cd (diff)
parentb3b8a1fea6ed5004bbad2f70833caee70402bf02 (diff)
downloadfocaccia-qemu-8f72c75cfc9b3c84a9b5e7a58ee5e471cb2f19c8.tar.gz
focaccia-qemu-8f72c75cfc9b3c84a9b5e7a58ee5e471cb2f19c8.zip
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20200526-pull-request' into staging
audio: add JACK client audiodev.
audio: bugfixes and cleanups.

# gpg: Signature made Tue 26 May 2020 08:56:21 BST
# 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/audio-20200526-pull-request:
  hw/mips/mips_fulong2e: Remove unused 'audio/audio.h' include
  audio: Let capture_callback handler use const buffer argument
  audio: Let audio_sample_to_uint64() use const samples argument
  audio: fix wavcapture segfault
  audio/mixeng: fix clang 10+ warning
  audio/jack: add JACK client audiodev
  hw/audio/gus: Use AUDIO_HOST_ENDIANNESS definition from 'audio/audio.h'
  es1370: check total frame count against current frame

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc.c')
-rw-r--r--ui/vnc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 1d7138a3a0..12a12714e1 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1177,7 +1177,7 @@ static void audio_capture_destroy(void *opaque)
 {
 }
 
-static void audio_capture(void *opaque, void *buf, int size)
+static void audio_capture(void *opaque, const void *buf, int size)
 {
     VncState *vs = opaque;