summary refs log tree commit diff stats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-02 20:31:49 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-03-02 20:31:49 +0000
commit683550488717333fed4295f5f994328196c7bf3e (patch)
tree2d8b4d374f288bbca4381fdb2008c73483ae187f /include
parentb49d31a05a1e8f2320bd99ecf84d0bb34c0f3266 (diff)
parentbcf19777df78193f7cdb108a55db44fd4f20d5b5 (diff)
downloadfocaccia-qemu-683550488717333fed4295f5f994328196c7bf3e.tar.gz
focaccia-qemu-683550488717333fed4295f5f994328196c7bf3e.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20170301-1' into staging
audio: replay support, sdl2 fix.

# gpg: Signature made Wed 01 Mar 2017 15:38:09 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-audio-20170301-1:
  audio/sdlaudio: Allow audio playback with SDL2
  audio: make audio poll timer deterministic
  replay: add record/replay for audio passthrough

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/sysemu/replay.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 7aad20b07f..f1c0712795 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -152,6 +152,13 @@ void replay_unregister_net(ReplayNetState *rns);
 void replay_net_packet_event(ReplayNetState *rns, unsigned flags,
                              const struct iovec *iov, int iovcnt);
 
+/* Audio */
+
+/*! Saves/restores number of played samples of audio out operation. */
+void replay_audio_out(int *played);
+/*! Saves/restores recorded samples of audio in operation. */
+void replay_audio_in(int *recorded, void *samples, int *wpos, int size);
+
 /* VM state operations */
 
 /*! Called at the start of execution.