diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-05 16:46:51 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-05 16:47:16 +0100 |
| commit | bc56fd3a23c94302937ed023d33e17a2de1a1b2a (patch) | |
| tree | b337e9ef5cbd6ffa34750a09d6f6c48d4b72ae5c /hw/audio/gus.c | |
| parent | dd76c10f9fa25f1117d28bca09c6bce0c53d2a3f (diff) | |
| parent | 9ea5ada76f34a0ef048b131c3a166d8564199bdb (diff) | |
| download | focaccia-qemu-bc56fd3a23c94302937ed023d33e17a2de1a1b2a.tar.gz focaccia-qemu-bc56fd3a23c94302937ed023d33e17a2de1a1b2a.zip | |
Merge remote-tracking branch 'kraxel/tags/pull-audio-20170504-1' into staging
audio: cleanups, bugfixes (memory leaks). # gpg: Signature made Thu 04 May 2017 08:16:50 AM BST # 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 * kraxel/tags/pull-audio-20170504-1: (30 commits) audio: Use ARRAY_SIZE from qemu/osdep.h audio: un-export OPLResetChip audio: Remove unused typedefs audio: UpdateHandler is not used anymore audio: IRQHandler is not used anymore audio: OPLSetUpdateHandler is not used anywhere audio: OPLSetIRQHandler is not used anywhere audio: GUSsample is int16_t audio: GUSword is uint16_t audio: GUSword is uint16_t audio: remove GUSchar audio: GUSbyte is uint8_t audio: Remove unused fields audio: Remove type field audio: Remove Unused OPL_TYPE_* audio: Unfold OPLSAMPLE audio: Remove INT32 audio: remove INT16 audio: Remove INT8 audio: remove UINT32 ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/audio/gus.c')
| -rw-r--r-- | hw/audio/gus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 3d08a6576a..ec103a4db9 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -53,7 +53,7 @@ typedef struct GUSState { uint32_t freq; uint32_t port; int pos, left, shift, irqs; - GUSsample *mixbuf; + int16_t *mixbuf; uint8_t himem[1024 * 1024 + 32 + 4096]; int samples; SWVoiceOut *voice; |