aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-05 22:06:54 +0000
committerJohannes Schickel2009-05-05 22:06:54 +0000
commit16bd3196848cdb24f6238371d776b435b7366c5a (patch)
tree1b1567c90dd1c235fba637354b298b32b6930291 /sound
parent08581ed69811d50e20eab2a3b491a49b0a494d60 (diff)
downloadscummvm-rg350-16bd3196848cdb24f6238371d776b435b7366c5a.tar.gz
scummvm-rg350-16bd3196848cdb24f6238371d776b435b7366c5a.tar.bz2
scummvm-rg350-16bd3196848cdb24f6238371d776b435b7366c5a.zip
At request by DrMcCoy enable DOSBox OPL2 by default whenever DISABLE_DOSBOX_OPL isn't defined.
svn-id: r40335
Diffstat (limited to 'sound')
-rw-r--r--sound/fmopl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp
index 7bc33fc724..7b5d4522ec 100644
--- a/sound/fmopl.cpp
+++ b/sound/fmopl.cpp
@@ -38,13 +38,13 @@ OPL *OPL::create(kOplType type) {
assert(!_hasInstance);
_hasInstance = true;
- if (type == kOpl2)
- return new MAME::OPL_MAME();
+#ifdef DISABLE_DOSBOX_OPL
+ if (type != kOpl2)
+ return 0;
else
-#ifndef DISABLE_DOSBOX_ADLIB
- return new DOSBox::OPL_DOSBox(type);
+ return new MAME::OPL_MAME();
#else
- return 0;
+ return new DOSBox::OPL_DOSBox(type);
#endif
}