Ticket #8284: gs-setup.diff

scumm\imuse.cpp

@@ -1173 +1173 @@
         if (result)
                 error("IMuse initialization - %s", MidiDriver::getErrorName(result));
 
+      if ((_midi_native) && (!_native_mt32)) {
+                // Special setup for General Synthesizer
+                byte buffer[11];
+                
+//TODO: use this one for GM games (SCUMM version = 6):
+                {
+                        // General MIDI reset (ensures compatibility on GS devices)
+                        memcpy(&buffer[0], "\x7E\x7F\x09\x01", 4);
+                        midi->sysEx(buffer, 4);
+                        g_system->delay_msecs (200);
+
+                        // standard percussion set
+                        midi->getPercussionChannel()->programChange(0x00);
+                }
+
+//TODO: use this one for MT-32 games without GM support (SCUMM version < 6):
+                {
+                        // There are different GS SysEx manufacturer id's.
+                        // That's why the GS data has to be sent twice with different id's.
+
+                        // Roland GS SysEx
+                        memcpy(&buffer[0], "\x41\x10\x42\x12\x40", 5);
+                
+                        // GS Reset
+                        memcpy(&buffer[5], "\x00\x7F\x00\x41", 4);
+                        midi->sysEx(buffer, 8);
+                        g_system->delay_msecs (200);
+
+                        // Setup reverb and chorus as used with MT-32
+                        memcpy(&buffer[5], "\x01\x30\x00\x0f", 4);
+                        midi->sysEx(buffer, 8);
+                        memcpy(&buffer[5], "\x01\x34\x40\x4b", 4);
+                        midi->sysEx(buffer, 8);
+                        memcpy(&buffer[5], "\x01\x3a\x10\x75", 4);
+                        midi->sysEx(buffer, 8);
+
+
+                        // Dream/Terratec GS SysEx
+                        memcpy(&buffer[0], "\x00\x20\x00\x00\x00\x12\x40", 7);
+                
+                        // GS Reset
+                        memcpy(&buffer[7], "\x00\x7F\x00\x41", 4);
+                        midi->sysEx(buffer, 11);
+                        g_system->delay_msecs (200);
+
+                        // Setup reverb and chorus as used with MT-32
+                        memcpy(&buffer[7], "\x01\x30\x00\x0f", 4);
+                        midi->sysEx(buffer, 11);
+                        memcpy(&buffer[7], "\x01\x34\x40\x4b", 4);
+                        midi->sysEx(buffer, 11);
+                        memcpy(&buffer[7], "\x01\x3a\x10\x75", 4);
+                        midi->sysEx(buffer, 11);
+
+        
+                        // Activate MT-32 compatible percussion set
+                        midi->getPercussionChannel()->programChange(0x7f);
+                }
+
+                // Set master volume
+                memcpy(&buffer[0], "\x7F\x7F\x04\x01\x00\x7F", 6);
+                midi->sysEx(buffer, 6);
+        }
+
         // Connect to the driver's timer
         midi->setTimerCallback(midi, &IMuseInternal::midiTimerCallback);
 }

scumm\imuse_player.cpp

@@ -256 +256 @@
 
         case 0x9: // Key On
                 if (!_scanning) {
-                        if (_isMT32 && !_se->isNativeMT32())
-                                param2 = (((param2 * 3) >> 2) + 32) & 0x7F;
+                        if (_isMT32 && !_se->isNativeMT32() && param2)
+                                param2 = (param2 << 1) / 3 + 43;
                         if ((part = getPart(chan)) != 0)
                                 part->noteOn(param1, param2);
                 } else {