From a71ba473f7f079415b01cb771602ceac403c46a3 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 23 Feb 2021 14:59:00 -0700
Subject: [PATCH] fix up post-rebase issues after rebase on master

---
 gtk2_ardour/recorder_ui.cc          | 17 ++++++++++-------
 gtk2_ardour/track_record_axis.cc    |  4 ++--
 libs/ardour/ardour/monitor_return.h |  2 +-
 libs/ardour/monitor_return.cc       |  4 ++--
 libs/ardour/route.cc                |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc
index 97c866992c..100a1dcde1 100644
--- a/gtk2_ardour/recorder_ui.cc
+++ b/gtk2_ardour/recorder_ui.cc
@@ -849,26 +849,29 @@ RecorderUI::regions_changed (boost::shared_ptr<ARDOUR::RegionList>, PBD::Propert
 void
 RecorderUI::gui_extents_changed ()
 {
-	pair<samplepos_t, samplepos_t> ext = PublicEditor::instance().session_gui_extents ();
+	pair<timepos_t, timepos_t> ext = PublicEditor::instance().session_gui_extents ();
 
-	if (ext.first == max_samplepos || ext.first >= ext.second) {
+	if (ext.first == timepos_t::max (ext.first.time_domain()) || ext.first >= ext.second) {
 		return;
 	}
 
+	samplepos_t start = ext.first.samples();
+	samplepos_t end = ext.second.samples();
+
 	for (list<TrackRecordAxis*>::const_iterator i = _recorders.begin (); i != _recorders.end (); ++i) {
-		(*i)->rec_extent (ext.first, ext.second);
+		(*i)->rec_extent (start, end);
 	}
 
 	/* round to the next minute */
 	if (_session) {
 		const samplecnt_t one_minute = 60 * _session->nominal_sample_rate ();
-		ext.first  = (ext.first / one_minute) * one_minute;
-		ext.second = ((ext.second / one_minute) + 1) * one_minute;
+		start  = (start / one_minute) * one_minute;
+		end = ((end / one_minute) + 1) * one_minute;
 	}
 
-	_ruler.set_gui_extents (ext.first, ext.second);
+	_ruler.set_gui_extents (start, end);
 	for (list<TrackRecordAxis*>::const_iterator i = _recorders.begin (); i != _recorders.end (); ++i) {
-		(*i)->set_gui_extents (ext.first, ext.second);
+		(*i)->set_gui_extents (start, end);
 	}
 }
 
diff --git a/gtk2_ardour/track_record_axis.cc b/gtk2_ardour/track_record_axis.cc
index bf21bea0ed..0e3712ac2a 100644
--- a/gtk2_ardour/track_record_axis.cc
+++ b/gtk2_ardour/track_record_axis.cc
@@ -749,8 +749,8 @@ TrackRecordAxis::TrackSummary::render (Cairo::RefPtr<Cairo::Context> const& cr,
 void
 TrackRecordAxis::TrackSummary::render_region (boost::shared_ptr<ARDOUR::Region> r, Cairo::RefPtr<Cairo::Context> const& cr, double y)
 {
-	const samplepos_t rp = r->position ();
-	const samplecnt_t rl = r->length ();
+	const samplepos_t rp = r->position_sample ();
+	const samplecnt_t rl = r->length_samples ();
 
 	 if (rp > _start) {
 		 cr->move_to (sample_to_xpos (rp), y);
diff --git a/libs/ardour/ardour/monitor_return.h b/libs/ardour/ardour/monitor_return.h
index bea1461fb9..a774e6d0fc 100644
--- a/libs/ardour/ardour/monitor_return.h
+++ b/libs/ardour/ardour/monitor_return.h
@@ -28,7 +28,7 @@ class AudioPort;
 class LIBARDOUR_API MonitorReturn : public InternalReturn
 {
 public:
-	MonitorReturn (Session&);
+	MonitorReturn (Session&, Temporal::TimeDomain);
 	~MonitorReturn ();
 
 	void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool);
diff --git a/libs/ardour/monitor_return.cc b/libs/ardour/monitor_return.cc
index fe883a3fc8..43682cc439 100644
--- a/libs/ardour/monitor_return.cc
+++ b/libs/ardour/monitor_return.cc
@@ -26,8 +26,8 @@
 
 using namespace ARDOUR;
 
-MonitorReturn::MonitorReturn (Session& s)
-	: InternalReturn (s, "Monitor Return")
+MonitorReturn::MonitorReturn (Session& s, Temporal::TimeDomain td)
+	: InternalReturn (s, td, "Monitor Return")
 	, _nch (0)
 	, _gain (1.f)
 {
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index cc88b06ae8..01b5bb1a7c 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3091,7 +3091,7 @@ Route::set_processor_state (const XMLNode& node, int version)
 			_main_outs->set_state (**niter, version);
 		} else if (prop->value() == "monreturn") {
 			if (!_intreturn) {
-				_intreturn.reset (new MonitorReturn (_session));
+				_intreturn.reset (new MonitorReturn (_session, time_domain()));
 				must_configure = true;
 			}
 			_intreturn->set_state (**niter, version);