From c457dd2eac4a32a9a17e76e6dd6bcd24fb750a2b Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 10 Sep 2022 18:12:16 +0200
Subject: [PATCH] Fix EventsSortByTimeAndType (type/event-type API mismatch)

Correct use would be
`parameter_is_midi (midi_parameter_type (ev->type()))`
However that only checks for control params. Note events
are excluded.
---
 libs/ardour/midi_playlist.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 93b21f79db..023b4d2f24 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -95,13 +95,13 @@ template<typename Time>
 struct EventsSortByTimeAndType {
     bool operator() (const Evoral::Event<Time>* a, const Evoral::Event<Time>* b) {
 	    if (a->time() == b->time()) {
-		    if (parameter_is_midi ((AutomationType)a->event_type()) &&
-		        parameter_is_midi ((AutomationType)b->event_type())) {
+		    if (a->is_midi () && b->is_midi ()) {
 			    /* negate return value since we must return whether
 			     * or not a should sort before b, not b before a
 			     */
 			    return !MidiBuffer::second_simultaneous_midi_byte_is_first (a->buffer()[0], b->buffer()[0]);
 		    }
+		    return a->type () < b->type ();
 	    }
 	    return a->time() < b->time();
     }