libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 12:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Moved handling of special reverb value 127 outside of the MIDI driver

Browse Source 
svn-id: r54459
This commit is contained in:
Filippos Karapetis 2010-11-24 14:51:29 +00:00
parent c3cb4c92a8
commit 9493b9add5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sci/sound/drivers/midi.cpp
View File

@ -378,10 +378,10 @@ int MidiPlayer_Midi::getVolume() {
}
void MidiPlayer_Midi::setReverb(byte reverb) {
assert(reverb < kReverbConfigNr || reverb == 127);
assert(reverb < kReverbConfigNr);
_reverb = reverb;
if (_hasReverb && _reverb != 127) // 127: SCI invalid, don't send to sound card
if (_hasReverb)
sendMt32SysEx(0x100001, _reverbConfig[_reverb], 3, true);
}

3
engines/sci/sound/midiparser_sci.cpp
View File

@ -501,7 +501,8 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
// Also, sci/sound/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
switch (info.basic.param1) {
case kSetReverb:
((MidiPlayer *)_driver)->setReverb(info.basic.param2);
if (info.basic.param2 != 127) // 127: SCI invalid, ignore
((MidiPlayer *)_driver)->setReverb(info.basic.param2);
break;
case kMidiHold:
// Check if the hold ID marker is the same as the hold ID

7
engines/sci/sound/music.cpp
View File

@ -227,7 +227,12 @@ MusicEntry *SciMusic::getActiveSci0MusicSlot() {
void SciMusic::setReverb(byte reverb) {
Common::StackLock lock(_mutex);
_pMidiDrv->setReverb(reverb);
if (reverb != 127) // 127: SCI invalid, ignore
_pMidiDrv->setReverb(reverb);
// SSCI stored a separate reverb value per song
// We don't, currently, as the current functionality
// works without an additional variable
}
byte SciMusic::getReverb() {