diff options
| author | Walter van Niftrik | 2010-01-21 16:28:09 +0000 |
|---|---|---|
| committer | Walter van Niftrik | 2010-01-21 16:28:09 +0000 |
| commit | b6742d12f6810801cf57cef5798a157c53e78515 (patch) | |
| tree | ee15c5e629ab3415f58652a713b8073dcfd4f0d6 /engines/sci | |
| parent | 208dbf1d9ad1bcb6e365d5ce9092de962d1d5cd9 (diff) | |
| download | scummvm-rg350-b6742d12f6810801cf57cef5798a157c53e78515.tar.gz scummvm-rg350-b6742d12f6810801cf57cef5798a157c53e78515.tar.bz2 scummvm-rg350-b6742d12f6810801cf57cef5798a157c53e78515.zip | |
SCI: Cleanup
svn-id: r47419
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/drivers/midi.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/mididriver.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 07d2a3a222..c28288544d 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -100,7 +100,7 @@ private: int _masterVolume; byte _reverbConfig[kReverbConfigNr][3]; - Channel _channels[16]; + Channel _channels[16]; uint8 _percussionMap[128]; int8 _keyShift[128]; int8 _volAdjust[128]; @@ -620,8 +620,9 @@ void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) { if (size > pos && ((0x100 * *(data + pos) + *(data + pos + 1)) == 0xabcd)) { patches = 96; pos += 2 + 8 * 48; - } else + } else { patches = 48; + } debugC(kDebugLevelSound, "[MT32-to-GM] %d MT-32 Patches detected", patches); debugC(kDebugLevelSound, "[MT32-to-GM] %d MT-32 Memory Timbres", memtimbres); diff --git a/engines/sci/sound/drivers/mididriver.h b/engines/sci/sound/drivers/mididriver.h index a1e6390a06..bc05a9aeba 100644 --- a/engines/sci/sound/drivers/mididriver.h +++ b/engines/sci/sound/drivers/mididriver.h @@ -95,7 +95,7 @@ public: virtual int getVolume() { return _driver ? _driver->property(MIDI_PROP_MASTER_VOLUME, 0xffff) : 0; - } + } virtual byte getReverb() { return _reverb; } virtual void setReverb(byte reverb) { _reverb = reverb; } |