From dec3b9bc2e64df3159acfe3fce3a07ad3ac30bd5 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 4 May 2021 15:34:17 -0600
Subject: [PATCH] cleanup mess from manual rebase against master (GUI edition)

---
 gtk2_ardour/editor_ops.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index c2188bdf97..26b75b58d1 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -3894,7 +3894,7 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
 
 		/* require region to span proposed trim */
 		switch (rv->region()->coverage (loc.start(), loc.end())) {
-		case Evoral::OverlapNone:
+		case Temporal::OverlapNone:
 			break;
 		default:
 			continue;
@@ -4831,7 +4831,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs)
 
 		case Copy:
 			/* copy region before adding, so we're not putting same object into two different playlists */
-			npl->add_region (RegionFactory::create (r, false), r->position() - first_position);
+			npl->add_region (RegionFactory::create (r, false), timepos_t (first_position.distance (r->position())));
 			break;
 
 		case Clear: