alex/nih-plug
1
0
Fork 0
Code Activity

Fix bug where aftertouch messages may not be processed

Browse source
This commit is contained in:
rbmj 2024-01-28 18:46:25 -08:00 committed by Robbert van der Helm
parent 916dfc16a2
commit 442d54ba50
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/midi.rs
View file

@ -419,11 +419,11 @@ impl<S: SysExMessage> NoteEvent<S> {
pub fn from_midi(timing: u32, midi_data: &[u8]) -> Result<Self, u8> { pub fn from_midi(timing: u32, midi_data: &[u8]) -> Result<Self, u8> {
let status_byte = midi_data.first().copied().unwrap_or_default(); let status_byte = midi_data.first().copied().unwrap_or_default();
let event_type = status_byte & midi::EVENT_TYPE_MASK; let event_type = status_byte & midi::EVENT_TYPE_MASK;
let channel = status_byte & midi::MIDI_CHANNEL_MASK;
if midi_data.len() >= 3 { if midi_data.len() >= 3 {
// TODO: Maybe add special handling for 14-bit CCs and RPN messages at some // TODO: Maybe add special handling for 14-bit CCs and RPN messages at some
// point, right now the plugin has to figure it out for itself // point, right now the plugin has to figure it out for itself
let channel = status_byte & midi::MIDI_CHANNEL_MASK;
match event_type { match event_type {
// You thought this was a note on? Think again! This is a cleverly disguised note off // You thought this was a note on? Think again! This is a cleverly disguised note off
// event straight from the 80s when Baud rate was still a limiting factor! // event straight from the 80s when Baud rate was still a limiting factor!
@ -464,13 +464,6 @@ impl<S: SysExMessage> NoteEvent<S> {
pressure: midi_data[2] as f32 / 127.0, pressure: midi_data[2] as f32 / 127.0,
}); });
} }
midi::CHANNEL_KEY_PRESSURE => {
return Ok(NoteEvent::MidiChannelPressure {
timing,
channel,
pressure: midi_data[1] as f32 / 127.0,
});
}
midi::PITCH_BEND_CHANGE => { midi::PITCH_BEND_CHANGE => {
return Ok(NoteEvent::MidiPitchBend { return Ok(NoteEvent::MidiPitchBend {
timing, timing,
@ -487,6 +480,18 @@ impl<S: SysExMessage> NoteEvent<S> {
value: midi_data[2] as f32 / 127.0, value: midi_data[2] as f32 / 127.0,
}); });
} }
_ => (),
}
}
if midi_data.len() >= 2 {
match event_type {
midi::CHANNEL_KEY_PRESSURE => {
return Ok(NoteEvent::MidiChannelPressure {
timing,
channel,
pressure: midi_data[1] as f32 / 127.0,
});
}
midi::PROGRAM_CHANGE => { midi::PROGRAM_CHANGE => {
return Ok(NoteEvent::MidiProgramChange { return Ok(NoteEvent::MidiProgramChange {
timing, timing,