[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.189,1.190

[Max Horn]

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

Modified Files:
	sky.cpp 
Log Message:
* Replaced MDT_PREFER_NATIVE/MDT_NATIVE by MDT_PREFER_MIDI/MDT_MIDI).
* Changed MidiDriver::createMidi so that if MD_ADLIB is passed, it
  now *does* instantiate the adlib driver.
* Rewrote MidiDriver::detectMusicDriver (code should be clearer now,
  and hopefully easier to adapt/maintain). Note that the behavior
  changed slightly (this may require some tweaking).
* Added MidiDriver::findMusicDriver which works similar to the old
  MidiDriver::parseMusicDriver but returns the full MidiDriverDescription
  and ignores all characters in the passed driver name following a colon ":".
* Changed MidiDriver::parseMusicDriver to use MidiDriver::findMusicDriver.
* Changed game engines to match the changes made to MidiDriver.
* Modified SCUMM engine to not record the selected midi/music driver
  (in _midiDriver), but rather the music *type* (in _musicType).


Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- sky.cpp	13 Dec 2005 15:07:19 -0000	1.189
+++ sky.cpp	30 Dec 2005 14:18:21 -0000	1.190
@@ -317,13 +317,13 @@
 
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
-	int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE | MDT_PREFER_NATIVE);
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
 	if (midiDriver == MD_ADLIB) {
 		_systemVars.systemFlags |= SF_SBLASTER;
 		_skyMusic = new AdlibMusic(_mixer, _skyDisk);
 	} else {
 		_systemVars.systemFlags |= SF_ROLAND;
-		if (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32))
+		if ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"))
 			_skyMusic = new MT32Music(MidiDriver::createMidi(midiDriver), _skyDisk);
 		else
 			_skyMusic = new GmMusic(MidiDriver::createMidi(midiDriver), _skyDisk);