From e1c874b299a3cd150227e2a8b23301f2066ab18c Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 27 Oct 2021 08:36:52 -0600
Subject: [PATCH] manually reverse 948500bbc7bc9 (final code is not identical
 to previous state)

---
 libs/ardour/ardour/midi_region.h | 1 -
 libs/ardour/midi_region.cc       | 7 +++----
 libs/ardour/triggerbox.cc        | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index a25092ac8c..747b5608ba 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -114,7 +114,6 @@ class LIBARDOUR_API MidiRegion : public Region
 	                  NoteMode                        mode,
 	                  timepos_t const &               read_start,
 	                  timecnt_t const &               read_length,
-	                  timepos_t const &               source_position,
 	                  MidiChannelFilter*              filter) const;
 
   protected:
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc
index 3b13dbdd90..9bedeefe31 100644
--- a/libs/ardour/midi_region.cc
+++ b/libs/ardour/midi_region.cc
@@ -283,7 +283,7 @@ MidiRegion::render (Evoral::EventSink<samplepos_t>& dst,
                     NoteMode                        mode,
                     MidiChannelFilter*              filter) const
 {
-	return render_range (dst, chan_n, mode, this->start(), _length, source_position(), filter);
+	return render_range (dst, chan_n, mode, this->start(), _length, filter);
 }
 
 int
@@ -292,7 +292,6 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
                           NoteMode                        mode,
                           timepos_t const &               read_start,
                           timecnt_t const &               read_length,
-                          timepos_t const &               source_position,
                           MidiChannelFilter*              filter) const
 {
 	/* precondition: caller has verified that we cover the desired section */
@@ -328,7 +327,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
 	src->midi_read (
 		lm, // source lock
 		dst, // destination buffer
-		source_position, // start position of the source in session samples
+		source_position(), // start position of the source in session samples
 		read_start,
 		read_length,
 		0,
@@ -341,7 +340,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
 	 * Note-Off's get inserted at the end of the region
 	 */
 
-	const timepos_t end = source_position + read_start + read_length;
+	const timepos_t end = source_position() + read_start + read_length;
 	tracker.resolve_notes (dst, end.samples());
 
 	return 0;
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 78d5057315..682ea9bda0 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -1181,7 +1181,8 @@ int
 MIDITrigger::load_data (boost::shared_ptr<MidiRegion> mr)
 {
 	drop_data ();
-	mr->render_range (data, 0, Sustained, mr->start(), mr->length(), timepos_t (Temporal::BeatTime), 0);
+
+	mr->render_range (data, 0, Sustained, mr->start(), mr->length(), 0);
 	set_name (mr->name());
 	data_length = data.span();
 	DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 loaded midi region, span is %2\n", name(), data_length));