diff options
| author | Alejandro Marzini | 2010-07-13 04:31:15 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-13 04:31:15 +0000 |
| commit | 609e08d5dbae3179eddf981abe73d69009432de4 (patch) | |
| tree | cddbd0a0e69eaa53b85f98f96dc410a307773f08 /engines/tinsel/tinsel.cpp | |
| parent | 8b6a670391f1b5103e3761d78eef8f41d64cf8cd (diff) | |
| parent | 03c0faa5d76f547603ee6389cdf958e2a6f0f43d (diff) | |
| download | scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.tar.gz scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.tar.bz2 scummvm-rg350-609e08d5dbae3179eddf981abe73d69009432de4.zip | |
Merged from trunk, from Rev 49499 to HEAD
svn-id: r50840
Diffstat (limited to 'engines/tinsel/tinsel.cpp')
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 4335b51818..3a4191227a 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -855,11 +855,11 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) if (cd_num >= 0) _system->getAudioCDManager()->openCD(cd_num); - MidiDriverType 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::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); + bool native_mt32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); + //bool adlib = (MidiDriver::getMusicType(dev) == MT_ADLIB); - _driver = MidiDriver::createMidi(midiDriver); + _driver = MidiDriver::createMidi(dev); if (native_mt32) _driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); |