[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.261,1.262

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22342/scumm

Modified Files:
	scumm.cpp 
Log Message:
Patch #1048326 Better MT-32 support 


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- scumm.cpp	18 Oct 2004 14:37:38 -0000	1.261
+++ scumm.cpp	21 Oct 2004 22:37:31 -0000	1.262
@@ -1343,7 +1343,7 @@
 
 void ScummEngine::setupMusic(int midi) {
 	_midiDriver = GameDetector::detectMusicDriver(midi);
-	_native_mt32 = ConfMan.getBool("native_mt32");
+	_native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32));
 
 #ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
 	/* Bind the mixer to the system => mixer will be invoked
@@ -1393,6 +1393,9 @@
 			}
 			if (midi == MDT_TOWNS)
 				_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
+			if (_midiDriver == MD_MT32) {
+				_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
+			}
 			_imuse->set_music_volume(ConfMan.getInt("music_volume"));
 		}
 	}