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: Add stronger MessageKind type in UMPUtils.h

Browse source
This commit is contained in:
reuk 2025-03-05 20:22:43 +00:00
parent 5e590c536b
commit 6d58bf637b
No known key found for this signature in database
6 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/juce_audio_basics/midi/ump/juce_UMPConversion.h
View file

@ -228,7 +228,7 @@ struct Conversion
{
const auto firstWord = v[0];
if (Utils::getMessageType (firstWord) != 0x4)
if (Utils::getMessageType (firstWord) != Utils::MessageKind::channelVoice2)
{
callback (v);
return;
@ -237,7 +237,7 @@ struct Conversion
const auto status = Utils::getStatus (firstWord);
const auto typeAndGroup = ((std::byte { 0x2 } << 0x4) | std::byte { Utils::getGroup (firstWord) });
switch (status)
switch ((uint8_t) status)
{
case 0x8: // note off
case 0x9: // note on
@ -250,10 +250,10 @@ struct Conversion
// If this is a note-on, and the scaled byte is 0,
// the scaled velocity should be 1 instead of 0
const auto needsCorrection = status == 0x9 && byte3 == std::byte { 0 };
const auto needsCorrection = status == std::byte { 0x9 } && byte3 == std::byte { 0 };
const auto correctedByte = needsCorrection ? std::byte { 1 } : byte3;
const auto shouldIgnore = status == 0xb && [&]
const auto shouldIgnore = status == std::byte { 0xb } && [&]
{
switch (uint8_t (byte2))
{
@ -298,8 +298,8 @@ struct Conversion
case 0x2: // rpn
case 0x3: // nrpn
{
const auto ccX = status == 0x2 ? std::byte { 101 } : std::byte { 99 };
const auto ccY = status == 0x2 ? std::byte { 100 } : std::byte { 98 };
const auto ccX = status == std::byte { 0x2 } ? std::byte { 101 } : std::byte { 99 };
const auto ccY = status == std::byte { 0x2 } ? std::byte { 100 } : std::byte { 98 };
const auto statusAndChannel = std::byte ((0xb << 0x4) | Utils::getChannel (firstWord));
const auto data = scaleTo14 (v[1]);