aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2004-10-21 22:37:37 +0000
committerEugene Sandulenko2004-10-21 22:37:37 +0000
commit9d0b746aaaaf78cfcc18e866e4375ad1de533bc4 (patch)
treef6570ed9ff19e0111704e638c6eec19e0f454f15 /scumm
parent9cb88f1d46388561457f44fb19dbe8d508ba14fc (diff)
downloadscummvm-rg350-9d0b746aaaaf78cfcc18e866e4375ad1de533bc4.tar.gz
scummvm-rg350-9d0b746aaaaf78cfcc18e866e4375ad1de533bc4.tar.bz2
scummvm-rg350-9d0b746aaaaf78cfcc18e866e4375ad1de533bc4.zip
Patch #1048326 Better MT-32 support
svn-id: r15635
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 14b4ae8b61..0b7437ec97 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1343,7 +1343,7 @@ void ScummEngine_v90he::scummInit() {
void ScummEngine::setupMusic(int midi) {
_midiDriver = GameDetector::detectMusicDriver(midi);
- _native_mt32 = ConfMan.getBool("native_mt32");
+ _native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32));
#ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
/* Bind the mixer to the system => mixer will be invoked
@@ -1393,6 +1393,9 @@ void ScummEngine::setupMusic(int midi) {
}
if (midi == MDT_TOWNS)
_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
+ if (_midiDriver == MD_MT32) {
+ _imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);
+ }
_imuse->set_music_volume(ConfMan.getInt("music_volume"));
}
}