Martchus
/
pianobooster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't give up on loading files with weird time signatures 

Displaying/handling those files might still need improvement but
the application should not frame those files as corrupted.
This commit is contained in:
Martchus 2023-09-10 13:23:45 +02:00
parent 35c86c5edf
commit bd787d5ae5
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/MidiTrack.cpp
View File

@ -188,36 +188,20 @@ void CMidiTrack::ignoreSysexEvent(byte_t data)
/* Time Signature */
void CMidiTrack::readTimeSignatureEvent()
{
byte_t timeSigNumerator;
byte_t timeSigDenominator;
CMidiEvent event;
byte_t b3, b4;
const auto len = readVarLen();
if (len!=4)
if (len != 4)
{
errorFail(SMF_CORRUPTED_MIDI_FILE);
return;
}
timeSigNumerator = readByte(); // The number on the top
timeSigDenominator = readByte(); // the number on the bottom
if (timeSigDenominator >= 5)
{
errorFail(SMF_CORRUPTED_MIDI_FILE);
return;
}
if (timeSigNumerator > 20)
{
errorFail(SMF_CORRUPTED_MIDI_FILE);
return;
}
//len = (1<<timeSigDenominator);
b3 = readByte(); /* Ignore the last bytes */
b4 = readByte(); /* Ignore the last bytes */
event.metaEvent(readDelaTime(), MIDI_PB_timeSignature, timeSigNumerator, 1<<timeSigDenominator);
const auto timeSigNumerator = readByte(); // the number on the top
const auto timeSigDenominator = readByte(); // the number on the bottom
const auto b3 = readByte();
const auto b4 = readByte();
auto event = CMidiEvent();
event.metaEvent(readDelaTime(), MIDI_PB_timeSignature, timeSigNumerator, 1 << timeSigDenominator);
m_trackEventQueue->push(event);
__dt(ppDebugTrack(4,"Key Signature %d/%d metronome %d quarter %d", timeSigNumerator, 1<<timeSigDenominator, b3, b4));
__dt(ppDebugTrack(4,"Key Signature %d/%d metronome %d quarter %d", timeSigNumerator, 1 << timeSigDenominator, b3, b4));
}
/* Key Signature */