aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorFlorian Kagerer2010-06-25 20:51:57 +0000
committerFlorian Kagerer2010-06-25 20:51:57 +0000
commitc35e3505319977e56d1c413b39133dfedf6c1105 (patch)
tree9bdc8bd3f602b347d56dd221132b14d1ce8ecc34 /engines/sci/sound
parent683d54a74660745d6bd408788170b19adb08581e (diff)
downloadscummvm-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/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 0d1f0f4db9..400189ee2e 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -68,7 +68,7 @@ void SciMusic::init() {
// We also don't yet support the 7.pat file of SCI1+ Mac games or SCI0 Mac patches, so we
// default to MIDI in those games to let them run.
Common::Platform platform = g_sci->getPlatform();
- uint32 dev = MidiDriver::detectDevice((getSciVersion() >= SCI_VERSION_2 || platform == Common::kPlatformMacintosh || (platform == Common::kPlatformAmiga && getSciVersion() >= SCI_VERSION_1_EGA)) ? (MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI) : (MDT_PCSPK | MDT_ADLIB | MDT_MIDI));
+ uint32 dev = MidiDriver::detectDevice((getSciVersion() >= SCI_VERSION_2 || platform == Common::kPlatformMacintosh || (platform == Common::kPlatformAmiga && getSciVersion() >= SCI_VERSION_1_EGA)) ? (MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32) : (MDT_PCSPK | MDT_ADLIB | MDT_MIDI));
switch (MidiDriver::getMusicType(dev)) {
case MT_ADLIB: