diff options
author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/sci/sound/midiparser_sci.cpp | |
parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip |
Merge branch 'master'
Diffstat (limited to 'engines/sci/sound/midiparser_sci.cpp')
-rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index ad7ba7ca36..422948f975 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -355,17 +355,14 @@ void MidiParser_SCI::sendInitCommands() { } } - // Send a velocity off signal to all channels - for (int i = 0; i < 15; ++i) { - if (_channelUsed[i]) - sendToDriver(0xB0 | i, 0x4E, 0); // Reset velocity - } - - // Center the pitch wheels and hold pedal in preparation for the next piece of music + // Reset all the parameters of the channels used by this song for (int i = 0; i < 16; ++i) { if (_channelUsed[i]) { - sendToDriver(0xE0 | i, 0, 0x40); // Reset pitch wheel - sendToDriver(0xB0 | i, 0x40, 0); // Reset hold pedal + sendToDriver(0xB0 | i, 0x07, 127); // Reset volume to maximum + sendToDriver(0xB0 | i, 0x0A, 64); // Reset panning to center + sendToDriver(0xB0 | i, 0x40, 0); // Reset hold pedal to none + sendToDriver(0xB0 | i, 0x4E, 0); // Reset velocity to none + sendToDriver(0xE0 | i, 0, 64); // Reset pitch wheel to center } } } |