From 6588398ce6fab85e287b10c2781d3797d7639cb9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 15 Sep 2010 22:00:20 +0000
Subject: MIDI: Send a reset MIDI device signal on startup.

This is currently done in the engine code. I adapted AGI, AGOS, DRACI,
GROOVIE, LURE, MADE, QUEEN, SAGA, SKY, TINSEL and TOUCHE to send a reset
device on startup. The sound output still works fine (started up a game
from every engine), so this should hopefully not introduce any regressions.

As far as I can tell it seems that SCUMM does send a proper device reset, so
I did not touch it. KYRA only sends a proper reset for MT-32 currently. I am
not sure about SCI though.

This fixes bug #3066826 "SIMON: MIDI notes off when using RTL after SCI".

svn-id: r52736
---
 engines/agi/sound_midi.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'engines/agi')

diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp
index d2636727ee..dcdaac53a7 100644
--- a/engines/agi/sound_midi.cpp
+++ b/engines/agi/sound_midi.cpp
@@ -74,8 +74,12 @@ SoundGenMIDI::SoundGenMIDI(AgiEngine *vm, Audio::Mixer *pMixer) : SoundGen(vm, p
 	DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB);
 	_driver = MidiDriver::createMidi(dev);
 
-	if (ConfMan.getBool("native_mt32"))
+	if (ConfMan.getBool("native_mt32") || MidiDriver::getMusicType(dev) == MT_MT32) {
+		_nativeMT32 = true;
 		_driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
+	} else {
+		_nativeMT32 = false;
+	}
 
 	memset(_channel, 0, sizeof(_channel));
 	memset(_channelVolume, 255, sizeof(_channelVolume));
@@ -125,10 +129,10 @@ int SoundGenMIDI::open() {
 
 	_driver->setTimerCallback(this, &onTimer);
 
-	// General MIDI System On message
-	// Resets all GM devices to default settings
-	_driver->sysEx((const byte *)"\x7E\x7F\x09\x01", 4);
-	g_system->delayMillis(20);
+	if (_nativeMT32)
+		_driver->sendMT32Reset();
+	else
+		_driver->sendGMReset();
 
 	return 0;
 }
-- 
cgit v1.2.3