diff options
Diffstat (limited to 'saga/saga.cpp')
-rw-r--r-- | saga/saga.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp index 06a003604f..9783dc1592 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -232,16 +232,12 @@ int SagaEngine::init(GameDetector &detector) { _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); |