thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Remove unused iMuse MIDI 'passthrough' code

Browse source
This commit is contained in:
Max Horn 2011-03-23 11:27:58 +01:00
parent 4172414e35
commit 756f592b61
5 changed files with 5 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/scumm/scumm.cpp
View file

@ -1858,17 +1858,15 @@ void ScummEngine::setupMusic(int midi) {
if (ConfMan.hasKey("tempo"))
_imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo"));
// YM2162 driver can't handle midi->getPercussionChannel(), NULL shouldn't init MT-32/GM/GS
if (/*(midi != MDT_TOWNS) && (*/midi != MDT_NONE/*)*/) {
if (midi != MDT_NONE) {
_imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32);
if (MidiDriver::getMusicType(dev) != MT_MT32) // MT-32 Emulation shouldn't be GM/GS initialized
_imuse->property(IMuse::PROP_GS, _enable_gs);
}
if (_game.heversion >= 60 /*|| midi == MDT_TOWNS*/) {
if (_game.heversion >= 60) {
_imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1);
_imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1);
}
/*if (midi == MDT_TOWNS)
_imuse->property(IMuse::PROP_DIRECT_PASSTHROUGH, 1);*/
}
}
}