[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.469,1.470

Max Horn fingolfin at users.sourceforge.net
Wed Dec 1 16:34:05 CET 2004


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

Modified Files:
	simon.cpp 
Log Message:
Moved MidiDriver creation code into the MidiDriver class (as static methods), same for some other MIDI related stuff

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -d -r1.469 -r1.470
--- simon.cpp	29 Nov 2004 00:13:17 -0000	1.469
+++ simon.cpp	2 Dec 2004 00:33:40 -0000	1.470
@@ -678,10 +678,10 @@
 	MidiDriver *driver = 0;
 	_midiDriver = MD_NULL;
 	if (_game == GAME_SIMON1AMIGA || _game == GAME_SIMON1CD32)
-		driver = GameDetector::createMidi(MD_NULL);	// Create fake MIDI driver for Simon1Amiga and Simon2CD32 for now
+		driver = MidiDriver::createMidi(MD_NULL);	// Create fake MIDI driver for Simon1Amiga and Simon2CD32 for now
 	else {
-		_midiDriver = GameDetector::detectMusicDriver(MDT_ADLIB | MDT_NATIVE);
-		driver = GameDetector::createMidi(_midiDriver);
+		_midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE);
+		driver = MidiDriver::createMidi(_midiDriver);
 	}
 	if (!driver)
 		driver = MidiDriver_ADLIB_create(_mixer);





More information about the Scummvm-git-logs mailing list