[Scummvm-cvs-logs] CVS: scummvm/saga saga.cpp,1.150,1.151

[Max Horn]

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

Modified Files:
	saga.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: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- saga.cpp	26 Nov 2005 16:54:55 -0000	1.150
+++ saga.cpp	30 Dec 2005 14:18:20 -0000	1.151
@@ -232,16 +232,12 @@
 	_console = new Console(this);
 
 	// Graphics should be initialized before music
-	int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
-	bool native_mt32 = (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32));
-
-	bool adlib = false;
+	int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
+	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
+	bool adlib = (midiDriver == MD_ADLIB);
 
 	MidiDriver *driver = MidiDriver::createMidi(midiDriver);
-	if (!driver) {
-		driver = MidiDriver_ADLIB_create(_mixer);
-		adlib = true;
-	} else if (native_mt32)
+	if (native_mt32)
 		driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 
 	_music = new Music(this, _mixer, driver, _musicVolume);