asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #34072 from arlez80/master

Browse source 
fixed pitch bend value and MIDI running status on the InputEventMIDI.
This commit is contained in:
Rémi Verschelde 2019-12-03 09:45:19 +01:00 committed by GitHub
commit c3609eb211
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/os/midi_driver.cpp
View file

@ -33,6 +33,7 @@
#include "core/os/os.h" #include "core/os/os.h"
#include "main/input_default.h" #include "main/input_default.h"
uint8_t MIDIDriver::last_received_message = 0x00;
MIDIDriver *MIDIDriver::singleton = NULL; MIDIDriver *MIDIDriver::singleton = NULL;
MIDIDriver *MIDIDriver::get_singleton() { MIDIDriver *MIDIDriver::get_singleton() {
@ -48,33 +49,42 @@ void MIDIDriver::receive_input_packet(uint64_t timestamp, uint8_t *data, uint32_
Ref<InputEventMIDI> event; Ref<InputEventMIDI> event;
event.instance(); event.instance();
uint32_t param_position = 1;
if (length >= 1) { if (length >= 1) {
event->set_channel(data[0] & 0xF); if ((data[0] & 0x80) == 0x00) {
event->set_message(data[0] >> 4); // 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()) { switch (event->get_message()) {
case MIDI_MESSAGE_AFTERTOUCH: case MIDI_MESSAGE_AFTERTOUCH:
if (length >= 3) { if (length >= 2 + param_position) {
event->set_pitch(data[1]); event->set_pitch(data[param_position]);
event->set_pressure(data[2]); event->set_pressure(data[param_position + 1]);
} }
break; break;
case MIDI_MESSAGE_CONTROL_CHANGE: case MIDI_MESSAGE_CONTROL_CHANGE:
if (length >= 3) { if (length >= 2 + param_position) {
event->set_controller_number(data[1]); event->set_controller_number(data[param_position]);
event->set_controller_value(data[2]); event->set_controller_value(data[param_position + 1]);
} }
break; break;
case MIDI_MESSAGE_NOTE_ON: case MIDI_MESSAGE_NOTE_ON:
case MIDI_MESSAGE_NOTE_OFF: case MIDI_MESSAGE_NOTE_OFF:
case MIDI_MESSAGE_PITCH_BEND: if (length >= 2 + param_position) {
if (length >= 3) { event->set_pitch(data[param_position]);
event->set_pitch(data[1]); event->set_velocity(data[param_position + 1]);
event->set_velocity(data[2]);
if (event->get_message() == MIDI_MESSAGE_NOTE_ON && event->get_velocity() == 0) { 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 // 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; 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: case MIDI_MESSAGE_PROGRAM_CHANGE:
if (length >= 2) { if (length >= 1 + param_position) {
event->set_instrument(data[1]); event->set_instrument(data[param_position]);
} }
break; break;
case MIDI_MESSAGE_CHANNEL_PRESSURE: case MIDI_MESSAGE_CHANNEL_PRESSURE:
if (length >= 2) { if (length >= 1 + param_position) {
event->set_pressure(data[1]); event->set_pressure(data[param_position]);
} }
break; break;
} }

1
core/os/midi_driver.h
View file

@ -41,6 +41,7 @@
class MIDIDriver { class MIDIDriver {
static MIDIDriver *singleton; static MIDIDriver *singleton;
static uint8_t last_received_message;
public: public:
static MIDIDriver *get_singleton(); static MIDIDriver *get_singleton();