Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing InputEventMIDI from MIDI with multiple messages eg chord #89871

Closed
wants to merge 1 commit into from
Closed

Fix missing InputEventMIDI from MIDI with multiple messages eg chord #89871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 71 additions & 63 deletions core/os/midi_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,77 +42,85 @@ void MIDIDriver::set_singleton() {
singleton = this;
}

void MIDIDriver::receive_input_packet(int device_index, uint64_t timestamp, uint8_t *data, uint32_t length) {
Ref<InputEventMIDI> event;
event.instantiate();
event->set_device(device_index);
uint32_t param_position = 1;

if (length >= 1) {
if (data[0] >= 0xF0) {
// channel does not apply to system common messages
event->set_channel(0);
event->set_message(MIDIMessage(data[0]));
last_received_message = data[0];
} else if ((data[0] & 0x80) == 0x00) {
// running status
event->set_channel(last_received_message & 0xF);
event->set_message(MIDIMessage(last_received_message >> 4));
param_position = 0;
} else {
event->set_channel(data[0] & 0xF);
event->set_message(MIDIMessage(data[0] >> 4));
param_position = 1;
last_received_message = data[0];
}
}
void MIDIDriver::receive_input_packet(int p_device_index, uint64_t p_timestamp, uint8_t *p_data, uint32_t p_length) {
// p_data may contain multiple messages, eg multiple note on using MIDI 'running status'.
uint32_t index = 0; // index will be incremented as each status or data byte is read from p_data.

switch (event->get_message()) {
case MIDIMessage::AFTERTOUCH:
if (length >= 2 + param_position) {
event->set_pitch(data[param_position]);
event->set_pressure(data[param_position + 1]);
}
break;
// Each time through loop will consume a MIDI message worth of bytes from p_data and create one InputEventMIDI.
while (index < p_length) {
Ref<InputEventMIDI> event;
event.instantiate();
event->set_device(p_device_index);

case MIDIMessage::CONTROL_CHANGE:
if (length >= 2 + param_position) {
event->set_controller_number(data[param_position]);
event->set_controller_value(data[param_position + 1]);
if (p_length - index >= 1) {
markofjohnson marked this conversation as resolved.
Show resolved Hide resolved
if (p_data[index] >= 0xF0) {
// Channel does not apply to system common messages.
event->set_channel(0);
event->set_message(MIDIMessage(p_data[index]));
last_received_message = p_data[index];
index++;
markofjohnson marked this conversation as resolved.
Show resolved Hide resolved
} else if ((p_data[index] & 0x80) == 0x00) {
// Running status, index is not changed because no new MIDI status byte, just additional data bytes.
event->set_channel(last_received_message & 0xF);
event->set_message(MIDIMessage(last_received_message >> 4));
} else {
event->set_channel(p_data[index] & 0xF);
event->set_message(MIDIMessage(p_data[index] >> 4));
last_received_message = p_data[index];
index++;
}
break;
}

case MIDIMessage::NOTE_ON:
case MIDIMessage::NOTE_OFF:
if (length >= 2 + param_position) {
event->set_pitch(data[param_position]);
event->set_velocity(data[param_position + 1]);
}
break;
switch (event->get_message()) {
case MIDIMessage::AFTERTOUCH:
if (p_length >= 2 + index) {
event->set_pitch(p_data[index++]);
event->set_pressure(p_data[index++]);
}
break;

case MIDIMessage::PITCH_BEND:
if (length >= 2 + param_position) {
event->set_pitch((data[param_position + 1] << 7) | data[param_position]);
}
break;
case MIDIMessage::CONTROL_CHANGE:
if (p_length >= 2 + index) {
event->set_controller_number(p_data[index++]);
event->set_controller_value(p_data[index++]);
}
break;

case MIDIMessage::PROGRAM_CHANGE:
if (length >= 1 + param_position) {
event->set_instrument(data[param_position]);
}
break;
case MIDIMessage::NOTE_ON:
case MIDIMessage::NOTE_OFF:
if (p_length >= 2 + index) {
event->set_pitch(p_data[index++]);
event->set_velocity(p_data[index++]);
}
break;

case MIDIMessage::CHANNEL_PRESSURE:
if (length >= 1 + param_position) {
event->set_pressure(data[param_position]);
}
break;
default:
break;
}
case MIDIMessage::PITCH_BEND:
if (p_length >= 2 + index) {
event->set_pitch((p_data[index + 1] << 7) | p_data[index]);
index += 2;
}
break;

case MIDIMessage::PROGRAM_CHANGE:
if (p_length >= 1 + index) {
event->set_instrument(p_data[index++]);
}
break;

case MIDIMessage::CHANNEL_PRESSURE:
if (p_length >= 1 + index) {
event->set_pressure(p_data[index++]);
}
break;

Input *id = Input::get_singleton();
id->parse_input_event(event);
default:
// Anything else means unsupported MIDI or invalid packet,
// cannot further parse p_data, so exit.
return;
}

Input::get_singleton()->parse_input_event(event);
}
}

PackedStringArray MIDIDriver::get_connected_inputs() {
Expand Down
2 changes: 1 addition & 1 deletion core/os/midi_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MIDIDriver {

virtual PackedStringArray get_connected_inputs();

static void receive_input_packet(int device_index, uint64_t timestamp, uint8_t *data, uint32_t length);
static void receive_input_packet(int p_device_index, uint64_t p_timestamp, uint8_t *p_data, uint32_t p_length);

MIDIDriver();
virtual ~MIDIDriver() {}
Expand Down
Loading