[Scummvm-cvs-logs] SF.net SVN: scummvm:[54459] scummvm/trunk/engines/sci/sound
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Nov 24 15:51:30 CET 2010
Revision: 54459
http://scummvm.svn.sourceforge.net/scummvm/?rev=54459&view=rev
Author: thebluegr
Date: 2010-11-24 14:51:29 +0000 (Wed, 24 Nov 2010)
Log Message:
-----------
SCI: Moved handling of special reverb value 127 outside of the MIDI driver
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/drivers/midi.cpp
scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
scummvm/trunk/engines/sci/sound/music.cpp
Modified: scummvm/trunk/engines/sci/sound/drivers/midi.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2010-11-24 14:38:08 UTC (rev 54458)
+++ scummvm/trunk/engines/sci/sound/drivers/midi.cpp 2010-11-24 14:51:29 UTC (rev 54459)
@@ -378,10 +378,10 @@
}
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);
}
Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-11-24 14:38:08 UTC (rev 54458)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp 2010-11-24 14:51:29 UTC (rev 54459)
@@ -501,7 +501,8 @@
// 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
Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp 2010-11-24 14:38:08 UTC (rev 54458)
+++ scummvm/trunk/engines/sci/sound/music.cpp 2010-11-24 14:51:29 UTC (rev 54459)
@@ -227,7 +227,12 @@
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() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list