From d58e7c7ee48333ef67042facc224d73dec539cdf Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 29 Jun 2021 17:29:29 -0600
Subject: [PATCH] Revert "fix handling of SMF files with consecutive noteOn
 events"

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 5c3e5f9afb4ab2f9938491a55915ca7a0767af80.
---
 libs/evoral/Sequence.cc | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/libs/evoral/Sequence.cc b/libs/evoral/Sequence.cc
index bbc7d5684a..2ba0b0bb24 100644
--- a/libs/evoral/Sequence.cc
+++ b/libs/evoral/Sequence.cc
@@ -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;