SCI: implement SCI0 midi driver track initialization

I put this in an separate commit to make it easier to review/revert. I've tried to make this as minimum invasive as possible. That's why I put this in place of the former call to onNewSound().

SCI_0_LATE sound drivers (probably also SCI_0_EARLY, but I don't know that) do some midi track initialization, mostly resetting certain values and assigning voices (hardware channels) to midi parts. The information for this comes from the track header.

The SCI0 version of the PC-98 sound driver relies on this code. The driver checks the channel flags with two different masks and assigns different sound channel types accordingly. This can't be done with the 0x4B event. Using the 0x4B event is sort of counter intuitive anyway, since only some of the SCI0 drivers even support that event.

It seems that the only driver making use of onNewSound() was MT-32. I've adapted the driver to my changes, although I am quite sure that the sound will be unaffected. The only thing that the MT-32 driver does with the header information is checking whether a midi part should play or not and assign exactly one timbre (with exactly the same number) to that part if required.

1 files changed, 5 insertions, 9 deletions

diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index ad4b0da397..22a5c6de9c 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -392,15 +392,11 @@ void MidiParser_SCI::sendInitCommands() {
 	// Set initial voice count
 	if (_pSnd) {
 		if (_soundVersion <= SCI_VERSION_0_LATE) {
-			static_cast<MidiPlayer *>(_driver)->onNewSound();
-
-			for (int i = 0; i < 15; ++i) {
-				byte voiceCount = 0;
-				if (_channelUsed[i]) {
-					voiceCount = _pSnd->soundRes->getInitialVoiceCount(i);
-					sendToDriver(0xB0 | i, 0x4B, voiceCount);
-				}
-			}
+			// Send header data to SCI0 sound drivers. The driver function which parses the header (opcode 3)
+			// seems to be implemented at least in all SCI0_LATE drivers. The things that the individual drivers
+			// do in that init function varies.
+			if (_track->header.byteSize())
+				static_cast<MidiPlayer *>(_driver)->initTrack(_track->header);
 		} else {
 			for (int i = 0; i < _track->channelCount; ++i) {
 				byte voiceCount = _track->channels[i].poly;