ardour/livetrax
13
0
Fork 0
Code

Revert "fix handling of SMF files with consecutive noteOn events"

Browse Source 
This breaks MIDI files that have events ordered On,On,Off,Off, and only fixes
the "malformed" On,On,Off. Correct fix requires collecting all events occuring
yat one time, sorting into Off,On and then merging.

This reverts commit 5c3e5f9afb.
This commit is contained in:
Paul Davis 2021-06-29 17:29:29 -06:00
parent fff2d2c5ad
commit d58e7c7ee4
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/evoral/Sequence.cc
View File

@ -1004,7 +1004,10 @@ Sequence<Time>::append_note_on_unlocked (const Event<Time>& ev, event_id_t evid)
assert (note->end_time() == std::numeric_limits<Temporal::Beats>::max());
note->set_id (evid);
DEBUG_TRACE (DEBUG::Sequence, string_compose ("New nascent/active note on %1 channel [%2]\n\n", (int) note->note(), note->channel()));
add_note_unlocked (note);
DEBUG_TRACE (DEBUG::Sequence, string_compose ("Appending active note on %1 channel %2\n",
(unsigned)(uint8_t)note->note(), note->channel()));
_write_notes[note->channel()].insert (note);
}
@ -1044,32 +1047,21 @@ Sequence<Time>::append_note_off_unlocked (const Event<Time>& ev)
++tmp;
NotePtr nn = *n;
if (ev.note() == nn->note() && nn->channel() == ev.channel()) {
if (!resolved) {
assert(ev.time() >= nn->time());
assert(ev.time() >= nn->time());
nn->set_length (ev.time() - nn->time());
nn->set_off_velocity (ev.velocity());
nn->set_length (ev.time() - nn->time());
nn->set_off_velocity (ev.velocity());
add_note_unlocked (nn);
_write_notes[ev.channel()].erase(n);
DEBUG_TRACE (DEBUG::Sequence, string_compose ("resolved note @ %1\n", *nn));
resolved = true;
} else {
/* additional matching nascent notes ... just
delete them.
*/
DEBUG_TRACE (DEBUG::Sequence, string_compose ("dropping additional nascent note @ %1\n", *nn));
_write_notes[ev.channel()].erase(n);
}
_write_notes[ev.channel()].erase(n);
DEBUG_TRACE (DEBUG::Sequence, string_compose ("resolved note @ %2 length: %1\n", nn->length(), nn->time()));
resolved = true;
break;
}
n = tmp;
}
if (!resolved) {
cerr << this << " spurious note off chan " << (int)ev.channel()
<< ", note " << (int)ev.note() << " @ " << ev.time() << endl;