user: Restore debug usage message for '-d ?' in user mode emulation

[qemu.git] / hw / gusemu_mixer.c

diff --git a/hw/gusemu_mixer.c b/hw/gusemu_mixer.c
index b3b5aa5d791857b3e72fa50442a2a7a43c9cfe11..6d8d9ced1178c2bcf0ec9ace96f4f6c200c77c2b 100644 (file)
--- a/hw/gusemu_mixer.c
+++ b/hw/gusemu_mixer.c
@@ -33,7 +33,7 @@
 
 /* samples are always 16bit stereo (4 bytes each, first right then left interleaved) */
 void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int numsamples,
-                   short *bufferpos)
+                   GUSsample *bufferpos)
 {
     /* note that byte registers are stored in the upper half of each voice register! */
     GUSbyte        *gusptr;
@@ -170,8 +170,8 @@ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int
                 }
 
                 /* mix samples into buffer */
-                *(bufferpos + 2 * sample)     += (short) ((sample1 * PanningPos) >> 4);        /* right */
-                *(bufferpos + 2 * sample + 1) += (short) ((sample1 * (15 - PanningPos)) >> 4); /* left */
+                *(bufferpos + 2 * sample)     += (GUSsample) ((sample1 * PanningPos) >> 4);        /* right */
+                *(bufferpos + 2 * sample + 1) += (GUSsample) ((sample1 * (15 - PanningPos)) >> 4); /* left */
             }
             /* write back voice and volume */
             GUSvoice(wVSRCurrVol)   = Volume32 / 32;