libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: Ignore digital channel data in midiMixChannels(), and remove some GOTOs

Browse Source 
These are found at the end of SCI01/SCI1 SND files with sound effects
This commit is contained in:
Filippos Karapetis 2020-08-30 03:06:51 +03:00
parent 648d669c2d
commit ef6f8c008f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engines/sci/sound/midiparser_sci.cpp
View File

@ -158,6 +158,9 @@ void MidiParser_SCI::midiMixChannels() {
_track->channels[i].time = 0;
_track->channels[i].prev = 0;
_track->channels[i].curPos = 0;
// Ignore the digital channel data, if it exists - it's not MIDI data
if (i == _track->digitalChannelNr)
continue;
totalSize += _track->channels[i].data.size();
}
@ -168,11 +171,12 @@ void MidiParser_SCI::midiMixChannels() {
byte midiCommand = 0, midiParam, globalPrev = 0;
long newDelta;
SoundResource::Channel *channel;
bool breakOut = false;
while ((channelNr = midiGetNextChannel(ticker)) != 0xFF) { // there is still an active channel
channel = &_track->channels[channelNr];
if (!validateNextRead(channel))
goto end;
break;
curDelta = channel->data[channel->curPos++];
channel->time += (curDelta == 0xF8 ? 240 : curDelta); // when the command is supposed to occur
if (curDelta == 0xF8)
@ -180,8 +184,10 @@ void MidiParser_SCI::midiMixChannels() {
newDelta = channel->time - ticker;
ticker += newDelta;
if (channelNr == _track->digitalChannelNr)
continue;
if (!validateNextRead(channel))
goto end;
break;
midiCommand = channel->data[channel->curPos++];
if (midiCommand != kEndOfTrack) {
// Write delta
@ -191,13 +197,16 @@ void MidiParser_SCI::midiMixChannels() {
}
*outData++ = (byte)newDelta;
}
// Write command
switch (midiCommand) {
case 0xF0: // sysEx
*outData++ = midiCommand;
do {
if (!validateNextRead(channel))
goto end;
if (!validateNextRead(channel)) {
breakOut = true;
break;
}
midiParam = channel->data[channel->curPos++];
*outData++ = midiParam;
} while (midiParam != 0xF7);
@ -207,8 +216,10 @@ void MidiParser_SCI::midiMixChannels() {
break;
default: // MIDI command
if (midiCommand & 0x80) {
if (!validateNextRead(channel))
goto end;
if (!validateNextRead(channel)) {
breakOut = true;
break;
}
midiParam = channel->data[channel->curPos++];
} else {// running status
midiParam = midiCommand;
@ -223,16 +234,20 @@ void MidiParser_SCI::midiMixChannels() {
*outData++ = midiCommand;
*outData++ = midiParam;
if (nMidiParams[(midiCommand >> 4) - 8] == 2) {
if (!validateNextRead(channel))
goto end;
if (!validateNextRead(channel)) {
breakOut = true;
break;
}
*outData++ = channel->data[channel->curPos++];
}
channel->prev = midiCommand;
globalPrev = midiCommand;
}
if (breakOut)
break;
}
end:
// Insert stop event
*outData++ = 0; // Delta
*outData++ = 0xFF; // Meta event