From e8410c03f506c622dca02c97894c2c59134aeeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=82=8B=E3=82=8B=20/=20=E3=81=8D=E3=81=AE?=
 =?UTF-8?q?=E3=82=82=E3=81=A8=20=E7=B5=90=E8=A1=A3?= <arleyuti@gmail.com>
Date: Tue, 3 Dec 2019 13:54:02 +0900
Subject: [PATCH] fixed set pitch bend value and implemented midi running
 status

---
 core/os/midi_driver.cpp | 48 +++++++++++++++++++++++++++--------------
 core/os/midi_driver.h   |  1 +
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/core/os/midi_driver.cpp b/core/os/midi_driver.cpp
index 7cb7ae130f0..81871d6c4f5 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;
 	}
diff --git a/core/os/midi_driver.h b/core/os/midi_driver.h
index e0e5e2be67f..33f49d19f59 100644
--- a/core/os/midi_driver.h
+++ b/core/os/midi_driver.h
@@ -41,6 +41,7 @@
 class MIDIDriver {
 
 	static MIDIDriver *singleton;
+	static uint8_t last_received_message;
 
 public:
 	static MIDIDriver *get_singleton();