From a393f75694fbf590773cf7388272c0b2c0e68f48 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 30 Nov 2021 18:37:29 +0100
Subject: [PATCH] Use shared port engine MIDI event compare operator

---
 libs/backends/alsa/alsa_audiobackend.h        | 3 +--
 libs/backends/coreaudio/coreaudio_backend.h   | 3 +--
 libs/backends/dummy/dummy_audiobackend.cc     | 6 +++---
 libs/backends/dummy/dummy_audiobackend.h      | 6 ++----
 libs/backends/portaudio/portaudio_backend.h   | 3 +--
 libs/backends/pulseaudio/pulseaudio_backend.h | 3 +--
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h
index 20230d3ed4..dbec753dd3 100644
--- a/libs/backends/alsa/alsa_audiobackend.h
+++ b/libs/backends/alsa/alsa_audiobackend.h
@@ -50,14 +50,13 @@ namespace ARDOUR {
 
 class AlsaAudioBackend;
 
-class AlsaMidiEvent {
+class AlsaMidiEvent : public BackendMIDIEvent {
 	public:
 		AlsaMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size);
 		AlsaMidiEvent (const AlsaMidiEvent& other);
 		size_t size () const { return _size; };
 		pframes_t timestamp () const { return _timestamp; };
 		const uint8_t* data () const { return _data; };
-		bool operator< (const AlsaMidiEvent &other) const { return timestamp () < other.timestamp (); };
 	private:
 		size_t _size;
 		pframes_t _timestamp;
diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h
index 299853f45b..b3839f68a2 100644
--- a/libs/backends/coreaudio/coreaudio_backend.h
+++ b/libs/backends/coreaudio/coreaudio_backend.h
@@ -45,14 +45,13 @@ namespace ARDOUR {
 
 class CoreAudioBackend;
 
-class CoreMidiEvent {
+class CoreMidiEvent : public BackendMIDIEvent {
   public:
 	CoreMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size);
 	CoreMidiEvent (const CoreMidiEvent& other);
 	size_t size () const { return _size; };
 	pframes_t timestamp () const { return _timestamp; };
 	const uint8_t* data () const { return _data; };
-	bool operator< (const CoreMidiEvent &other) const { return timestamp () < other.timestamp (); };
   private:
 	size_t _size;
 	pframes_t _timestamp;
diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index 6eb67aad18..ea8fcfb5a7 100644
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -1387,7 +1387,7 @@ void DummyAudioPort::midi_to_wavetable (DummyMidiBuffer const * const src, size_
 		// somewhat arbitrary mapping for quick visual feedback
 		float v = -.5f;
 		if ((*it)->size() == 3) {
-			const unsigned char *d = (*it)->const_data();
+			const unsigned char *d = (*it)->data();
 			if ((d[0] & 0xf0) == 0x90) { // note on
 				v = .25f + d[2] / 512.f;
 			}
@@ -1890,9 +1890,9 @@ DummyMidiEvent::DummyMidiEvent (const DummyMidiEvent& other)
 	, _timestamp (other.timestamp ())
 	, _data (0)
 {
-	if (other.size () && other.const_data ()) {
+	if (other.size () && other.data ()) {
 		_data = (uint8_t*) malloc (other.size ());
-		memcpy (_data, other.const_data (), other.size ());
+		memcpy (_data, other.data (), other.size ());
 	}
 };
 
diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h
index 65bd5a8c8b..bc85a258c1 100644
--- a/libs/backends/dummy/dummy_audiobackend.h
+++ b/libs/backends/dummy/dummy_audiobackend.h
@@ -52,16 +52,14 @@ namespace DummyMidiData {
 };
 
 
-class DummyMidiEvent {
+class DummyMidiEvent : public BackendMIDIEvent {
 	public:
 		DummyMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size);
 		DummyMidiEvent (const DummyMidiEvent& other);
 		~DummyMidiEvent ();
 		size_t size () const { return _size; };
 		pframes_t timestamp () const { return _timestamp; };
-		const unsigned char* const_data () const { return _data; };
-		unsigned char* data () { return _data; };
-		bool operator< (const DummyMidiEvent &other) const { return timestamp () < other.timestamp (); };
+		const uint8_t* data () const { return _data; };
 	private:
 		size_t _size;
 		pframes_t _timestamp;
diff --git a/libs/backends/portaudio/portaudio_backend.h b/libs/backends/portaudio/portaudio_backend.h
index b4c56b29c9..55231aa90c 100644
--- a/libs/backends/portaudio/portaudio_backend.h
+++ b/libs/backends/portaudio/portaudio_backend.h
@@ -43,14 +43,13 @@ namespace ARDOUR {
 
 class PortAudioBackend;
 
-class PortMidiEvent {
+class PortMidiEvent : public BackendMIDIEvent {
 	public:
 		PortMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size);
 		PortMidiEvent (const PortMidiEvent& other);
 		size_t size () const { return _size; };
 		pframes_t timestamp () const { return _timestamp; };
 		const uint8_t* data () const { return _data; };
-		bool operator< (const PortMidiEvent &other) const { return timestamp () < other.timestamp (); };
 	private:
 		size_t _size;
 		pframes_t _timestamp;
diff --git a/libs/backends/pulseaudio/pulseaudio_backend.h b/libs/backends/pulseaudio/pulseaudio_backend.h
index 22561db41d..813f8cd709 100644
--- a/libs/backends/pulseaudio/pulseaudio_backend.h
+++ b/libs/backends/pulseaudio/pulseaudio_backend.h
@@ -43,7 +43,7 @@ namespace ARDOUR {
 
 class PulseAudioBackend;
 
-class PulseMidiEvent
+class PulseMidiEvent : public BackendMIDIEvent
 {
 public:
 	PulseMidiEvent (const pframes_t timestamp, const uint8_t* data, size_t size);
@@ -53,7 +53,6 @@ public:
 	pframes_t timestamp () const { return _timestamp; };
 	const uint8_t* data () const { return _data; };
 	const uint8_t* const_data () const { return _data; };
-	bool operator< (const PulseMidiEvent& other) const { return timestamp () < other.timestamp (); };
 
 private:
 	size_t    _size;