diff options
| author | Max Horn | 2010-06-21 21:36:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-21 21:36:36 +0000 |
| commit | bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3 (patch) | |
| tree | e5b53717ffc5972cec14be581f586228c245b858 /engines/lure | |
| parent | 49448af6cb2613460fe37caf79bdb1ed4c206715 (diff) | |
| download | scummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.tar.gz scummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.tar.bz2 scummvm-rg350-bbad3f333a9227ccb1de633a0fe92d9e01ad7bb3.zip | |
Patch #1956501: "GUI/LAUNCHER: Midi device selection"
svn-id: r50128
Diffstat (limited to 'engines/lure')
| -rw-r--r-- | engines/lure/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp index e725b7c31a..1b306b5021 100644 --- a/engines/lure/sound.cpp +++ b/engines/lure/sound.cpp @@ -50,13 +50,13 @@ SoundManager::SoundManager() { _soundData = NULL; _paused = false; - MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); - _isRoland = midiDriver != MD_ADLIB; - _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + _isRoland = MidiDriver::getMusicType(dev) != MT_ADLIB; + _nativeMT32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); Common::set_to(_channelsInUse, _channelsInUse + NUM_CHANNELS, false); - _driver = MidiDriver::createMidi(midiDriver); + _driver = MidiDriver::createMidi(dev); int statusCode = _driver->open(); if (statusCode) { warning("Sound driver returned error code %d", statusCode); |