ardour/livetrax
13
0
Fork 0
Code

Update MIDI Event precedence

Browse Source 
A patch-change that is concurrent with a note-on event should be sent
before the given Note-on event.

As follow up: CCs also need to be prioritize to send bank-select first.

see also https://discourse.ardour.org/t/midi-strangeness-patch-setting-and-first-notes/101415
This commit is contained in:
Robin Gareus 2019-07-30 21:17:15 +02:00
parent bf5da033dc
commit 8dbbc19567
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/evoral/src/Sequence.cpp
View File

@ -238,13 +238,32 @@ Sequence<Time>::const_iterator::choose_next(Time earliest_t)
{ {
_type = NIL; _type = NIL;
// Next earliest note on // Next earliest note on, if any
if (_note_iter != _seq->notes().end()) { if (_note_iter != _seq->notes().end()) {
_type = NOTE_ON; _type = NOTE_ON;
earliest_t = (*_note_iter)->time(); earliest_t = (*_note_iter)->time();
} }
// Use the next note off iff it's earlier or the same time as the note on /* Use the next earliest patch change iff it is earlier or coincident with the note-on.
* A patch-change with the same time-stamp applies to the concurrent note-on */
if (_patch_change_iter != _seq->patch_changes().end()) {
if (_type == NIL || (*_patch_change_iter)->time() <= earliest_t) {
_type = PATCH_CHANGE;
earliest_t = (*_patch_change_iter)->time();
}
}
/* Use the next earliest controller iff it's earlier or coincident with the note-on
* or patch-change. Bank-select (CC0, CC32) needs to be sent before the PGM. */
if (_control_iter != _control_iters.end() &&
_control_iter->list && _control_iter->x != DBL_MAX) {
if (_type == NIL || _control_iter->x <= earliest_t.to_double()) {
_type = CONTROL;
earliest_t = Time(_control_iter->x);
}
}
/* .. but prefer to send any Note-off first */
if ((!_active_notes.empty())) { if ((!_active_notes.empty())) {
if (_type == NIL || _active_notes.top()->end_time().to_double() <= earliest_t.to_double()) { if (_type == NIL || _active_notes.top()->end_time().to_double() <= earliest_t.to_double()) {
_type = NOTE_OFF; _type = NOTE_OFF;
@ -252,16 +271,7 @@ Sequence<Time>::const_iterator::choose_next(Time earliest_t)
} }
} }
// Use the next earliest controller iff it's earlier than the note event /* SysEx is last, always sent after any other concurrent 3 byte event */
if (_control_iter != _control_iters.end() &&
_control_iter->list && _control_iter->x != DBL_MAX) {
if (_type == NIL || _control_iter->x < earliest_t.to_double()) {
_type = CONTROL;
earliest_t = Time(_control_iter->x);
}
}
// Use the next earliest SysEx iff it's earlier than the controller
if (_sysex_iter != _seq->sysexes().end()) { if (_sysex_iter != _seq->sysexes().end()) {
if (_type == NIL || (*_sysex_iter)->time() < earliest_t) { if (_type == NIL || (*_sysex_iter)->time() < earliest_t) {
_type = SYSEX; _type = SYSEX;
@ -269,13 +279,6 @@ Sequence<Time>::const_iterator::choose_next(Time earliest_t)
} }
} }
// Use the next earliest patch change iff it's earlier than the SysEx
if (_patch_change_iter != _seq->patch_changes().end()) {
if (_type == NIL || (*_patch_change_iter)->time() < earliest_t) {
_type = PATCH_CHANGE;
earliest_t = (*_patch_change_iter)->time();
}
}
return earliest_t; return earliest_t;
} }