diff options
| author | Max Horn | 2005-12-29 21:21:16 +0000 |
|---|---|---|
| committer | Max Horn | 2005-12-29 21:21:16 +0000 |
| commit | e74799c32e57cd12839b8265ffbebfb7cb88e6d7 (patch) | |
| tree | 6b33b0b7937ff48ad4063979ad710d329a558f21 | |
| parent | 911300a9e36c9e8603ff2fcd5b62962886c3154d (diff) | |
| download | scummvm-rg350-e74799c32e57cd12839b8265ffbebfb7cb88e6d7.tar.gz scummvm-rg350-e74799c32e57cd12839b8265ffbebfb7cb88e6d7.tar.bz2 scummvm-rg350-e74799c32e57cd12839b8265ffbebfb7cb88e6d7.zip | |
cleanup
svn-id: r19846
| -rw-r--r-- | simon/simon.cpp | 18 | ||||
| -rw-r--r-- | simon/simon.h | 2 | ||||
| -rw-r--r-- | sky/music/mt32music.cpp | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 0ef8a9e81d..0fa97e4484 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -556,19 +556,21 @@ int SimonEngine::init(GameDetector &detector) { // Setup midi driver MidiDriver *driver = 0; - _midiDriver = MD_NULL; - if (getPlatform() == Common::kPlatformAmiga) + if (getPlatform() == Common::kPlatformAmiga) { driver = MidiDriver::createMidi(MD_NULL); // Create fake MIDI driver for Simon1Amiga and Simon2CD32 for now - else { - _midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE); - driver = MidiDriver::createMidi(_midiDriver); + _native_mt32 = false; + } else { + int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_NATIVE); + driver = MidiDriver::createMidi(midiDriver); + _native_mt32 = (ConfMan.getBool("native_mt32") || (midiDriver == MD_MT32)); } if (!driver) driver = MidiDriver_ADLIB_create(_mixer); - else if (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)) + else if (_native_mt32) { driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); + } - midi.mapMT32toGM (getGameType() == GType_SIMON1 && !(ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))); + midi.mapMT32toGM (getGameType() == GType_SIMON1 && !_native_mt32); midi.set_driver(driver); int ret = midi.open(); @@ -623,7 +625,7 @@ int SimonEngine::init(GameDetector &detector) { #endif TABLES_MEM_SIZE = 100000; // Check whether to use MT-32 MIDI tracks in Simon the Sorcerer 2 - if ((getGameType() == GType_SIMON2) && (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32))) + if ((getGameType() == GType_SIMON2) && _native_mt32) MUSIC_INDEX_BASE = (1128 + 612) / 4; else MUSIC_INDEX_BASE = 1128 / 4; diff --git a/simon/simon.h b/simon/simon.h index 35c6039ea6..26747d7f9d 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -401,7 +401,7 @@ protected: byte _lettersToPrintBuf[80]; MidiPlayer midi; - int _midiDriver; + bool _native_mt32; int _numScreenUpdates; int _vgaTickCounter; diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp index 396d49b9aa..7f1a34d2c4 100644 --- a/sky/music/mt32music.cpp +++ b/sky/music/mt32music.cpp @@ -89,8 +89,6 @@ void MT32Music::setupChannels(uint8 *channelData) { } } -#define MIDI_PACK(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) - bool MT32Music::processPatchSysEx(uint8 *sysExData) { uint8 sysExBuf[15]; |