diff options
| author | Max Horn | 2005-12-30 14:18:21 +0000 |
|---|---|---|
| committer | Max Horn | 2005-12-30 14:18:21 +0000 |
| commit | 60fcd5a1713d143cd6fb4d0a9c6f3be030c65b5b (patch) | |
| tree | 6f72d5cd2ed9d83c2087130e5ca1e236b70aaa1c /sky | |
| parent | 2b156bd4c1d334931513a834a757723ec290db0b (diff) | |
| download | scummvm-rg350-60fcd5a1713d143cd6fb4d0a9c6f3be030c65b5b.tar.gz scummvm-rg350-60fcd5a1713d143cd6fb4d0a9c6f3be030c65b5b.tar.bz2 scummvm-rg350-60fcd5a1713d143cd6fb4d0a9c6f3be030c65b5b.zip | |
* 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).
svn-id: r19859
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/sky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp index 74b5f1d0b3..88020be035 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -317,13 +317,13 @@ int SkyEngine::init(GameDetector &detector) { _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); |