[Scummvm-cvs-logs] scummvm master -> 38dc6640dccf861be5313a691141f36f81d22ef3

bluegr md5 at scummvm.org
Sun Nov 20 20:00:47 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
38dc6640dc SCI: Reset parameters for all channels used by a song when it starts


Commit: 38dc6640dccf861be5313a691141f36f81d22ef3
    https://github.com/scummvm/scummvm/commit/38dc6640dccf861be5313a691141f36f81d22ef3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-20T10:59:31-08:00

Commit Message:
SCI: Reset parameters for all channels used by a song when it starts

Changed paths:
    engines/sci/sound/midiparser_sci.cpp



diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index ad7ba7c..422948f 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
 		}
 	}
 }






More information about the Scummvm-git-logs mailing list