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

Added a method MidiMessage::withTimeStamp, and some MidiMessageSequence unit-tests

Browse source
This commit is contained in:
jules 2017-10-13 09:27:34 +01:00
parent ac60ce57ce
commit b5432c710a
3 changed files with 74 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/juce_audio_basics/midi/juce_MidiMessage.cpp
View file

@ -93,7 +93,7 @@ int MidiMessage::getMessageLengthFromFirstByte (const uint8 firstByte) noexcept
1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
};
return messageLengths [firstByte & 0x7f];
return messageLengths[firstByte & 0x7f];
}
//==============================================================================
@ -344,6 +344,11 @@ String MidiMessage::getDescription() const
return String::toHexString (getRawData(), getRawDataSize());
}
MidiMessage MidiMessage::withTimeStamp (double newTimestamp) const
{
return { *this, newTimestamp };
}
int MidiMessage::getChannel() const noexcept
{
auto data = getRawData();
@ -964,7 +969,7 @@ bool MidiMessage::isMidiMachineControlGoto (int& hours, int& minutes, int& secon
hours = data[7] % 24; // (that some machines send out hours > 24)
minutes = data[8];
seconds = data[9];
frames = data[10];
frames = data[10];
return true;
}
@ -985,8 +990,8 @@ String MidiMessage::getMidiNoteName (int note, bool useSharps, bool includeOctav
if (isPositiveAndBelow (note, 128))
{
String s (useSharps ? sharpNoteNames [note % 12]
: flatNoteNames [note % 12]);
String s (useSharps ? sharpNoteNames[note % 12]
: flatNoteNames [note % 12]);
if (includeOctaveNumber)
s << (note / 12 + (octaveNumForMiddleC - 5));
@ -1079,7 +1084,7 @@ const char* MidiMessage::getRhythmInstrumentName (const int n)
NEEDS_TRANS("Open Cuica"), NEEDS_TRANS("Mute Triangle"), NEEDS_TRANS("Open Triangle")
};
return (n >= 35 && n <= 81) ? names [n - 35] : nullptr;
return (n >= 35 && n <= 81) ? names[n - 35] : nullptr;
}
const char* MidiMessage::getControllerName (const int n)