[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.99,2.100

Jamieson Christian jamieson630 at users.sourceforge.net
Tue Sep 30 06:19:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20944/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
Fixed MT-32 init not getting called

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.99
retrieving revision 2.100
diff -u -d -r2.99 -r2.100
--- imuse.cpp	30 Sep 2003 08:25:57 -0000	2.99
+++ imuse.cpp	30 Sep 2003 13:18:25 -0000	2.100
@@ -1087,6 +1087,8 @@
 	case IMuse::PROP_NATIVE_MT32:
 		_native_mt32 = (value > 0);
 		Instrument::nativeMT32(value > 0);
+		if (value > 0 && _midi_native)
+			initMT32(_midi_native);
 		break;
 
 	case IMuse::PROP_MULTI_MIDI:
@@ -1164,9 +1166,6 @@
 	int result = midi->open();
 	if (result)
 		error("IMuse initialization - %s", MidiDriver::getErrorName(result));
-
-	if (_native_mt32)
-		initMT32(midi);
 
 	// Connect to the driver's timer
 	midi->setTimerCallback(midi, &IMuseInternal::midiTimerCallback);





More information about the Scummvm-git-logs mailing list