[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.69,1.70

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


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

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

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- saga.cpp	29 Nov 2004 00:17:03 -0000	1.69
+++ saga.cpp	2 Dec 2004 00:33:39 -0000	1.70
@@ -187,12 +187,12 @@
 	_gfx = new Gfx(_system, disp_info.logical_w, disp_info.logical_h, detector);
 
 	// Graphics should be initialized before music
-	int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
 	bool native_mt32 = (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32));
 
 	bool adlib = false;
 
-	MidiDriver *driver = GameDetector::createMidi(midiDriver);
+	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
 	if (!driver) {
 		driver = MidiDriver_ADLIB_create(_mixer);
 		adlib = true;





More information about the Scummvm-git-logs mailing list