Ticket #3441: mt-32.patch

sound/softsynth/mt32/i386.cpp

@@ -227 +227 @@
         return output;
 }
 
-static inline void atti386_produceOutput1(int tmplen, Bit16s myvolume, Bit16s *useBuf, Bit16s *snd) {
+static inline void atti386_produceOutput1(int tmplen, Bit16u myvolume, Bit16s *useBuf, Bit16s *snd) {
         __asm__ __volatile__(
                 "movl %0,  %%ecx      \n" \
                 "movw %1,  %%ax       \n" \
@@ -804 +804 @@
         return tmplen << 2;
 }
 
-int i386_produceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16s volume) {
+int i386_produceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16u volume) {
         int tmplen = (len >> 1);
         if (tmplen == 0) {
                 return 0;

sound/softsynth/mt32/i386.h

@@ -39 +39 @@
 int i386_mixBuffers(Bit16s * buf1, Bit16s *buf2, int len);
 int i386_mixBuffersRingMix(Bit16s * buf1, Bit16s *buf2, int len);
 int i386_mixBuffersRing(Bit16s * buf1, Bit16s *buf2, int len);
-int i386_produceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16s volume);
+int i386_produceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16u volume);
 #endif
 
 #endif

sound/softsynth/mt32/synth.cpp

@@ -1040 +1040 @@
         rset = mt32ram.system.chanAssign;
         printDebug(" Part assign:     1=%02d 2=%02d 3=%02d 4=%02d 5=%02d 6=%02d 7=%02d 8=%02d Rhythm=%02d", rset[0], rset[1], rset[2], rset[3], rset[4], rset[5], rset[6], rset[7], rset[8]);
         printDebug(" Master volume: %d", mt32ram.system.masterVol);
-        masterVolume = (Bit16u)(mt32ram.system.masterVol * 32767 / 100);
+        masterVolume = (Bit16u)(mt32ram.system.masterVol * 65535 / 100);
         if (!tables.init(this, pcmWaves, (float)myProp.sampleRate, masterTune)) {
                 report(ReportType_errorSampleRate, NULL);
                 return false;
@@ -1103 +1103 @@
         return 0;
 }
 
-void ProduceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16s volume) {
+void ProduceOutput1(Bit16s *useBuf, Bit16s *stream, Bit32u len, Bit16u volume) {
 #if MT32EMU_USE_MMX > 2
         //FIXME:KG: This appears to introduce crackle
         int donelen = i386_produceOutput1(useBuf, stream, len, volume);