Skip to content

synthio: treat a Note On of velocity 0 as a Note Off in MidiTrack #11660

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

Open
tyeth wants to merge 1 commit into from
Open

synthio: treat a Note On of velocity 0 as a Note Off in MidiTrack #11660

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
33 changes: 20 additions & 13 deletions shared-module/synthio/MidiTrack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,20 @@ static bool need_bytes(synthio_miditrack_obj_t *self, size_t count) {
return true;
}

static mp_obj_t parse_note(synthio_miditrack_obj_t *self) {
// Returns the note in the low 8 bits and the velocity in the next 8, or -1
// if the pair could not be read.
static int parse_note(synthio_miditrack_obj_t *self) {
uint8_t *buffer = self->track.buf;
if (!need_bytes(self, 2)) {
return MP_OBJ_NEW_SMALL_INT(0);
return -1;
}
uint8_t note = buffer[(self->pos)++];
if (note > 127 || buffer[(self->pos)++] > 127) {
uint8_t note = buffer[self->pos++];
uint8_t velocity = buffer[self->pos++];
if (note > 127 || velocity > 127) {
record_midi_stream_error(self);
return -1;
}
return MP_OBJ_NEW_SMALL_INT(note);
return note | (velocity << 8);
}

// MIDI variable-length quantity: up to 4 bytes of 7 bits each.
Expand Down Expand Up @@ -115,14 +119,17 @@ static void decode_until_pause(synthio_miditrack_obj_t *self) {
}
}
switch (status >> 4) {
case 8: { // Note Off
mp_obj_t note = parse_note(self);
synthio_span_change_note(&self->synth, note, SYNTHIO_SILENCE);
break;
}
case 9: { // Note On
mp_obj_t note = parse_note(self);
synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, note);
case 8: // Note Off
case 9: { // Note On, but a velocity of zero means Note Off
int parsed = parse_note(self);
if (parsed >= 0) {
mp_obj_t note = MP_OBJ_NEW_SMALL_INT(parsed & 0xff);
if ((status >> 4) == 9 && (parsed >> 8) != 0) {
synthio_span_change_note(&self->synth, SYNTHIO_SILENCE, note);
} else {
synthio_span_change_note(&self->synth, note, SYNTHIO_SILENCE);
}
}
break;
}
case 10:
Expand Down
Loading