libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 08:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In Simon 1, when returning to normal size, the MIDI music contains "All

Browse Source 
Controllers Off" messages. This should, among other things, reset the channel
volume to 100. Until now, however, we did not re-adjust the volume by the
master volume (like we do for ordinary volume control changes), so all of a
sudden there would be channels playing at the wrong volume.

This was particularly noticeable if you first turned down the music volume to
really low.

svn-id: r22412
This commit is contained in:
Torbjörn Andersson 2006-05-12 10:29:58 +00:00
parent 171285e8e5
commit 4ecee0e0f2
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/simon/midi.cpp
View File

@ -110,6 +110,12 @@ void MidiPlayer::send(uint32 b) {
// has already been allocated.
if (!_current->channel[b & 0x0F])
return;
} else if ((b & 0xFFF0) == 0x79B0) {
// A minimum implementation of "All controllers off" should set
// the volume to 100. We have to make sure that volume is
// re-adjusted by the master volume afterwards. This happens in
// Simon 1, on eating the mushroom to turn back to normal size.
_current->volume[channel] = 100;
}
if (!_current->channel[channel])
@ -118,6 +124,8 @@ void MidiPlayer::send(uint32 b) {
if (channel == 9)
_current->channel[9]->volume(_current->volume[9] * _masterVolume / 255);
_current->channel[channel]->send(b);
if ((b & 0xFFF0) == 0x79B0)
_current->channel[channel]->volume(_current->volume[channel] * _masterVolume / 255);
}
}