diff options
| author | Florian Kagerer | 2010-06-25 20:51:57 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-06-25 20:51:57 +0000 |
| commit | c35e3505319977e56d1c413b39133dfedf6c1105 (patch) | |
| tree | 9bdc8bd3f602b347d56dd221132b14d1ce8ecc34 /engines/parallaction | |
| parent | 683d54a74660745d6bd408788170b19adb08581e (diff) | |
| download | scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.tar.gz scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.tar.bz2 scummvm-rg350-c35e3505319977e56d1c413b39133dfedf6c1105.zip | |
AUDIO: get rid of MDT_PREFER_MIDI since it should be sufficient to either select MDT_PREFER_MT32 or MDT_PREFER_GM
svn-id: r50288
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/parallaction_br.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 6dbf526c96..470c698a21 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -61,7 +61,7 @@ Common::Error Parallaction_br::init() { _disk = new DosDisk_br(this); } _disk->setLanguage(2); // NOTE: language is now hardcoded to English. Original used command-line parameters. - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); MidiDriver *driver = MidiDriver::createMidi(dev); _soundManI = new DosSoundMan_br(this, driver); } else { diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 7e06aaa5ab..f1e7b14583 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -166,7 +166,7 @@ Common::Error Parallaction_ns::init() { _disk->init(); if (getPlatform() == Common::kPlatformPC) { - MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); + MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); MidiDriver *driver = MidiDriver::createMidi(dev); _soundManI = new DosSoundMan_ns(this, driver); _soundManI->setMusicVolume(ConfMan.getInt("music_volume")); |