[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.455,2.456

Max Horn fingolfin at users.sourceforge.net
Fri Oct 17 17:23:35 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.455
retrieving revision 2.456
diff -u -d -r2.455 -r2.456
--- scummvm.cpp	17 Oct 2003 23:16:52 -0000	2.455
+++ scummvm.cpp	18 Oct 2003 00:22:46 -0000	2.456
@@ -604,7 +604,7 @@
 	// differing from the regular version(s) of that game.
 	_gameName = ConfMan.hasKey("basename") ? ConfMan.get("basename") : detector->_game.gameName;
 
-	_midiDriver = detector->_midi_driver;
+	_midiDriver = GameDetector::detectMusicDriver(detector->_game.midi);
 
 	_demoMode = ConfMan.getBool("demo_mode");
 	_noSubtitles = ConfMan.getBool("nosubtitles");
@@ -654,11 +654,11 @@
 	_silentDigitalImuse = false;
 	if (!_mixer->bindToSystem(syst)) {
 		warning("Sound mixer initialization failed");
-		if (detector->_midi_driver == MD_ADLIB ||
-		    detector->_midi_driver == MD_PCSPK ||
-		    detector->_midi_driver == MD_PCJR)
+		if (_midiDriver == MD_ADLIB ||
+		    _midiDriver == MD_PCSPK ||
+		    _midiDriver == MD_PCJR)
 		{
-			_midiDriver = detector->_midi_driver = MD_NULL;
+			_midiDriver = MD_NULL;
 			warning("MIDI driver depends on sound mixer, switching to null MIDI driver");
 		}
 		_silentDigitalImuse = true;
@@ -679,7 +679,7 @@
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);
 	} else if (_version > 2) {
-		MidiDriver *driver = detector->createMidi();
+		MidiDriver *driver = detector->createMidi(_midiDriver);
 		if (driver && _native_mt32)
 			driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 		_musicEngine = _imuse = IMuse::create(syst, _mixer, driver);





More information about the Scummvm-git-logs mailing list