From 6e7f9029ec9b808ab6d54c75a02e6a41acc81fbd Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 3 Jul 2021 17:20:08 -0600
Subject: [PATCH] fix types of Playlist member objects (lost in rebase conflict
 resolution)

---
 libs/ardour/ardour/playlist.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index bc7e8542d2..642f180f0c 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -361,10 +361,10 @@ protected:
 	 *  do automation-follows-regions.
 	 */
 
-	std::list<Evoral::RangeMove<samplepos_t> > pending_range_moves;
+	std::list<Temporal::RangeMove> pending_range_moves;
 
 	/** Extra sections added to regions during trims */
-	std::list<Evoral::Range<samplepos_t> > pending_region_extensions;
+	std::list<Temporal::TimeRange> pending_region_extensions;
 
 	uint32_t           in_set_state;
 	bool               in_undo;