mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Midi file fix to avoid multiple end-of-track events. Some openGL tweaks.

Browse source
This commit is contained in:
jules 2011-09-27 11:33:42 +01:00
parent dcc767868f
commit f35738afe0
9 changed files with 141 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

44
modules/juce_audio_basics/midi/juce_MidiFile.cpp
View file

@ -383,32 +383,34 @@ void MidiFile::writeTrack (OutputStream& mainOut, const int trackNum)
{
const MidiMessage& mm = ms.getEventPointer(i)->message;
const int tick = roundToInt (mm.getTimeStamp());
const int delta = jmax (0, tick - lastTick);
MidiFileHelpers::writeVariableLengthInt (out, delta);
lastTick = tick;
const uint8* data = mm.getRawData();
int dataSize = mm.getRawDataSize();
const uint8 statusByte = data[0];
if (statusByte == lastStatusByte
&& (statusByte & 0xf0) != 0xf0
&& dataSize > 1
&& i > 0)
if (! mm.isEndOfTrackMetaEvent())
{
++data;
--dataSize;
}
const int tick = roundToInt (mm.getTimeStamp());
const int delta = jmax (0, tick - lastTick);
MidiFileHelpers::writeVariableLengthInt (out, delta);
lastTick = tick;
out.write (data, dataSize);
lastStatusByte = statusByte;
const uint8* data = mm.getRawData();
int dataSize = mm.getRawDataSize();
const uint8 statusByte = data[0];
if (statusByte == lastStatusByte
&& (statusByte & 0xf0) != 0xf0
&& dataSize > 1
&& i > 0)
{
++data;
--dataSize;
}
out.write (data, dataSize);
lastStatusByte = statusByte;
}
}
out.writeByte (0);
{
out.writeByte (0); // (tick delta)
const MidiMessage m (MidiMessage::endOfTrack());
out.write (m.getRawData(), m.getRawDataSize());
}