[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.161,1.162

[Max Horn]

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

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

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- sky.cpp	29 Nov 2004 00:14:25 -0000	1.161
+++ sky.cpp	2 Dec 2004 00:33:41 -0000	1.162
@@ -263,16 +263,16 @@
 	
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
-	int midiDriver = GameDetector::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
 	if (midiDriver == MD_ADLIB) {
 		_systemVars.systemFlags |= SF_SBLASTER;
 		_skyMusic = new AdlibMusic(_mixer, _skyDisk, _system);
 	} else {
 		_systemVars.systemFlags |= SF_ROLAND;
 		if (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32))
-			_skyMusic = new MT32Music(GameDetector::createMidi(midiDriver), _skyDisk, _system);
+			_skyMusic = new MT32Music(MidiDriver::createMidi(midiDriver), _skyDisk, _system);
 		else
-			_skyMusic = new GmMusic(GameDetector::createMidi(midiDriver), _skyDisk, _system);
+			_skyMusic = new GmMusic(MidiDriver::createMidi(midiDriver), _skyDisk, _system);
 	}
 
 	if (isCDVersion()) {