aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-10-10 07:43:12 +0000
committerTorbjörn Andersson2010-10-10 07:43:12 +0000
commit582bd9a395e13881d96ea7c7cc54d3469d696565 (patch)
treee89f372881d8276b3c9907ad5c4dde52d81be867 /sound
parent043a293ae92126b38a65b62708e789fb96affeba (diff)
downloadscummvm-rg350-582bd9a395e13881d96ea7c7cc54d3469d696565.tar.gz
scummvm-rg350-582bd9a395e13881d96ea7c7cc54d3469d696565.tar.bz2
scummvm-rg350-582bd9a395e13881d96ea7c7cc54d3469d696565.zip
MIDIDRV: Prefer PCjr over PC Speaker
If I understand this correctly, if the player's desired music driver isn't supported (e.g. if you have MIDI as default, and haven't said anything specifically for Maniac Mansion), it tries to pick the "best" supported music driver instead. In this case, check if PCjr is supported before picking PC Speaker. svn-id: r53105
Diffstat (limited to 'sound')
-rw-r--r--sound/mididrv.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index f4cf75ca73..ec198dc334 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -247,10 +247,10 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
tp = MT_PC98;
else if (flags & MDT_ADLIB)
tp = MT_ADLIB;
- else if (flags & MDT_PCSPK)
- tp = MT_PCSPK;
else if (flags & MDT_PCJR)
tp = MT_PCJR;
+ else if (flags & MDT_PCSPK)
+ tp = MT_PCSPK;
else if (flags & MDT_C64)
tp = MT_C64;
else if (flags & MDT_AMIGA)