Failed in applying to current master (
apply log)
Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>, Laurent Vivier <laurent@vivier.eu>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Maydell <peter.maydell@linaro.org>
audio/audio_int.h | 111 +++---
audio/audio_template.h | 134 ++++----
audio/dsound_template.h | 89 +++--
include/qemu/audio-capture.h | 4 +-
include/qemu/audio.h | 55 ++-
audio/alsaaudio.c | 260 ++++++--------
audio/audio-be.c | 4 +-
audio/audio-mixeng-be.c | 636 ++++++++++++-----------------------
audio/audio_win_int.c | 31 +-
audio/dbusaudio.c | 138 ++++----
audio/dsoundaudio.c | 256 ++++++--------
audio/jackaudio.c | 106 +++---
audio/mixeng.c | 1 -
audio/noaudio.c | 65 ++--
audio/ossaudio.c | 281 +++++++---------
audio/paaudio.c | 254 +++++++-------
audio/pwaudio.c | 203 ++++++-----
audio/sdlaudio.c | 156 ++++-----
audio/sndioaudio.c | 92 ++---
audio/spiceaudio.c | 94 +++---
audio/wavaudio.c | 88 ++---
audio/wavcapture.c | 2 +-
hw/audio/ac97.c | 2 +-
hw/audio/adlib.c | 2 +-
hw/audio/asc.c | 2 +-
hw/audio/cs4231a.c | 6 +-
hw/audio/es1370.c | 2 +-
hw/audio/gus.c | 2 +-
hw/audio/lm4549.c | 6 +-
hw/audio/sb16.c | 8 +-
hw/audio/via-ac97.c | 2 +-
hw/audio/virtio-snd.c | 2 +-
hw/audio/wm8750.c | 4 +-
hw/display/xlnx_dp.c | 2 +-
hw/usb/dev-audio.c | 2 +-
tests/audio/test-audio.c | 23 +-
ui/vnc.c | 2 +-
audio/coreaudio.m | 188 +++++------
audio/trace-events | 42 +++
39 files changed, 1461 insertions(+), 1896 deletions(-)