aboutsummaryrefslogtreecommitdiff
path: root/common/gameDetector.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-16 22:00:33 +0000
committerJamieson Christian2003-05-16 22:00:33 +0000
commit5a15ce808a61b29dc902e3cb039b8ebb515409b3 (patch)
tree2ca685155ab142df2be081da1fe1f9271deebf5c /common/gameDetector.cpp
parenta4550829965bb23eb42aee205648e621e0336473 (diff)
downloadscummvm-rg350-5a15ce808a61b29dc902e3cb039b8ebb515409b3.tar.gz
scummvm-rg350-5a15ce808a61b29dc902e3cb039b8ebb515409b3.tar.bz2
scummvm-rg350-5a15ce808a61b29dc902e3cb039b8ebb515409b3.zip
Feature [557411] Adlib sound effects with GM drivers.
Support for simultaneous drivers is based on a #define in imuse.cpp, and is disabled by default. svn-id: r7582
Diffstat (limited to 'common/gameDetector.cpp')
-rw-r--r--common/gameDetector.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index a1905c61a2..30aacaad93 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -689,7 +689,11 @@ MidiDriver *GameDetector::createMidi() {
switch(drv) {
case MD_NULL: return MidiDriver_NULL_create();
#ifndef __PALM_OS__
- case MD_ADLIB: _use_adlib = true; return MidiDriver_ADLIB_create();
+ // In the case of Adlib, we won't specify anything.
+ // IMuse is designed to set up its own Adlib driver
+ // if need be, and we only have to specify a native
+ // driver.
+ case MD_ADLIB: _use_adlib = true; return NULL;
#else
case MD_YPA1: return MidiDriver_YamahaPa1_create();
#endif