From 5f4fa2d9ea354f94008b52669ea9e5e4090be0f3 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 3 Jul 2021 18:35:24 -0600
Subject: [PATCH] fix gap callback argument types at point of use

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

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index ae0d4d1e52..bb0bf3113d 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -190,6 +190,7 @@ public:
 	boost::shared_ptr<Region> combine (const RegionList&);
 	void uncombine (boost::shared_ptr<Region>);
 	void fade_range (std::list<TimelineRange>&);
+	void remove_gaps (timecnt_t const & gap_threshold, timecnt_t const & leave_gap, boost::function<void (timepos_t, timecnt_t)> gap_callback);
 
 	void shuffle (boost::shared_ptr<Region>, int dir);
 
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 0177fb126f..e30defd2ee 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -1207,14 +1207,14 @@ Playlist::cut_copy (boost::shared_ptr<Playlist> (Playlist::*pmf)(timepos_t const
 boost::shared_ptr<Playlist>
 Playlist::cut (list<TimelineRange>& ranges, bool result_is_hidden)
 {
-	boost::shared_ptr<Playlist> (Playlist::*pmf) (samplepos_t, samplecnt_t, bool) = &Playlist::cut;
+	boost::shared_ptr<Playlist> (Playlist::*pmf) (timepos_t const & , timecnt_t const &, bool) = &Playlist::cut;
 	return cut_copy (pmf, ranges, result_is_hidden);
 }
 
 boost::shared_ptr<Playlist>
 Playlist::copy (list<TimelineRange>& ranges, bool result_is_hidden)
 {
-	boost::shared_ptr<Playlist> (Playlist::*pmf) (samplepos_t, samplecnt_t, bool) = &Playlist::copy;
+	boost::shared_ptr<Playlist> (Playlist::*pmf) (timepos_t const &, timecnt_t const &, bool) = &Playlist::copy;
 	return cut_copy (pmf, ranges, result_is_hidden);
 }