[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.103,1.104

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


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

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

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- queen.cpp	30 Nov 2004 21:01:25 -0000	1.103
+++ queen.cpp	2 Dec 2004 00:33:39 -0000	1.104
@@ -349,8 +349,8 @@
 	// Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages
 	_mixer->setMusicVolume(256);
 
-	int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
-	MidiDriver *driver = GameDetector::createMidi(midiDriver);
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
+	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
 	if (!driver)
 		driver = MidiDriver_ADLIB_create(_mixer);
 	else if (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32))





More information about the Scummvm-git-logs mailing list