Merge pull request #34072 from arlez80/master

fixed pitch bend value and MIDI running status on the InputEventMIDI.

1 files changed, 32 insertions, 16 deletions

diff --git a/core/os/midi_driver.cpp b/core/os/midi_driver.cpp
index 7cb7ae130f..81871d6c4f 100644
--- a/core/os/midi_driver.cpp
+++ b/core/os/midi_driver.cpp
@@ -33,6 +33,7 @@
 #include "core/os/os.h"
 #include "main/input_default.h"
 
+uint8_t MIDIDriver::last_received_message = 0x00;
 MIDIDriver *MIDIDriver::singleton = NULL;
 MIDIDriver *MIDIDriver::get_singleton() {
 
@@ -48,33 +49,42 @@ void MIDIDriver::receive_input_packet(uint64_t timestamp, uint8_t *data, uint32_
 
 	Ref<InputEventMIDI> event;
 	event.instance();
+	uint32_t param_position = 1;
 
 	if (length >= 1) {
-		event->set_channel(data[0] & 0xF);
-		event->set_message(data[0] >> 4);
+		if ((data[0] & 0x80) == 0x00) {
+			// running status
+			event->set_channel(last_received_message & 0xF);
+			event->set_message(last_received_message >> 4);
+			param_position = 0;
+		} else {
+			event->set_channel(data[0] & 0xF);
+			event->set_message(data[0] >> 4);
+			param_position = 1;
+			last_received_message = data[0];
+		}
 	}
 
 	switch (event->get_message()) {
 		case MIDI_MESSAGE_AFTERTOUCH:
-			if (length >= 3) {
-				event->set_pitch(data[1]);
-				event->set_pressure(data[2]);
+			if (length >= 2 + param_position) {
+				event->set_pitch(data[param_position]);
+				event->set_pressure(data[param_position + 1]);
 			}
 			break;
 
 		case MIDI_MESSAGE_CONTROL_CHANGE:
-			if (length >= 3) {
-				event->set_controller_number(data[1]);
-				event->set_controller_value(data[2]);
+			if (length >= 2 + param_position) {
+				event->set_controller_number(data[param_position]);
+				event->set_controller_value(data[param_position + 1]);
 			}
 			break;
 
 		case MIDI_MESSAGE_NOTE_ON:
 		case MIDI_MESSAGE_NOTE_OFF:
-		case MIDI_MESSAGE_PITCH_BEND:
-			if (length >= 3) {
-				event->set_pitch(data[1]);
-				event->set_velocity(data[2]);
+			if (length >= 2 + param_position) {
+				event->set_pitch(data[param_position]);
+				event->set_velocity(data[param_position + 1]);
 
 				if (event->get_message() == MIDI_MESSAGE_NOTE_ON && event->get_velocity() == 0) {
 					// https://www.midi.org/forum/228-writing-midi-software-send-note-off,-or-zero-velocity-note-on
@@ -83,15 +93,21 @@ void MIDIDriver::receive_input_packet(uint64_t timestamp, uint8_t *data, uint32_
 			}
 			break;
 
+		case MIDI_MESSAGE_PITCH_BEND:
+			if (length >= 2 + param_position) {
+				event->set_pitch((data[param_position + 1] << 7) | data[param_position]);
+			}
+			break;
+
 		case MIDI_MESSAGE_PROGRAM_CHANGE:
-			if (length >= 2) {
-				event->set_instrument(data[1]);
+			if (length >= 1 + param_position) {
+				event->set_instrument(data[param_position]);
 			}
 			break;
 
 		case MIDI_MESSAGE_CHANNEL_PRESSURE:
-			if (length >= 2) {
-				event->set_pressure(data[1]);
+			if (length >= 1 + param_position) {
+				event->set_pressure(data[param_position]);
 			}
 			break;
 	}