[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.280,1.281

Max Horn fingolfin at users.sourceforge.net
Wed Dec 1 16:35:04 CET 2004


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

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

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- scumm.cpp	28 Nov 2004 21:24:00 -0000	1.280
+++ scumm.cpp	2 Dec 2004 00:33:40 -0000	1.281
@@ -1310,7 +1310,7 @@
 }
 
 void ScummEngine::setupMusic(int midi) {
-	_midiDriver = GameDetector::detectMusicDriver(midi);
+	_midiDriver = MidiDriver::detectMusicDriver(midi);
 	_native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32));
 
 #ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
@@ -1338,7 +1338,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 && _heversion <= 60) {
-		MidiDriver *nativeMidiDriver = GameDetector::createMidi(_midiDriver);
+		MidiDriver *nativeMidiDriver = MidiDriver::createMidi(_midiDriver);
 		if (nativeMidiDriver != NULL && _native_mt32)
 			nativeMidiDriver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 		bool multi_midi = ConfMan.getBool("multi_midi") && _midiDriver != MD_NULL && (midi & MDT_ADLIB);





More information about the Scummvm-git-logs mailing list