From 04688292d6632b587c4da6946ea17e2a3cdc8dea Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 14 Jan 2021 12:55:40 -0700
Subject: [PATCH] manual fixups for recent rebase conflicts left in the wrong
 state

---
 libs/ardour/ardour/midi_playlist.h | 2 +-
 libs/ardour/ardour/playlist.h      | 6 +++---
 libs/ardour/midi_playlist.cc       | 2 +-
 libs/ardour/playlist.cc            | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index 7f732648b9..ee781fadc2 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -78,7 +78,7 @@ public:
 
 	bool destroy_region (boost::shared_ptr<Region>);
 
-	void _split_region (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
+	void _split_region (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
 
 	void set_note_mode (NoteMode m) { _note_mode = m; }
 
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 9dd02a0fba..a9f7ebd9c0 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -434,14 +434,14 @@ protected:
 	void sort_regions ();
 
 	void ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude);
-	void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, Thawlist& thawlist);
+	void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist);
 
 	virtual void remove_dependents (boost::shared_ptr<Region> /*region*/) {}
 	virtual void region_going_away (boost::weak_ptr<Region> /*region*/) {}
 
 	virtual XMLNode& state (bool);
 
-	bool add_region_internal (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
+	bool add_region_internal (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
 
 	int  remove_region_internal (boost::shared_ptr<Region>, ThawList& thawlist);
 	void copy_regions (RegionList&) const;
@@ -460,7 +460,7 @@ protected:
 	void begin_undo ();
 	void end_undo ();
 
-	virtual void _split_region (boost::shared_ptr<Region>, timepos_t const & position, Thawlist& thawlist);
+	virtual void _split_region (boost::shared_ptr<Region>, timepos_t const & position, ThawList& thawlist);
 
 	typedef std::pair<boost::shared_ptr<Region>, boost::shared_ptr<Region> > TwoRegions;
 
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 489aa5ffd9..c373f1126b 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -196,7 +196,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 	return changed;
 }
 void
-MidiPlaylist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, Thawlist& thawlist)
+MidiPlaylist::_split_region (boost::shared_ptr<Region> region, timepos_t const & playlist_position, ThawList& thawlist)
 {
 	if (!region->covers (playlist_position)) {
 		return;
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index fa55174dff..a74a4d6ed3 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -750,7 +750,7 @@ Playlist::set_region_ownership ()
 }
 
 bool
-Playlist::add_region_internal (boost::shared_ptr<Region> region, timepos_t const & position, Thawlist& thawlist)
+Playlist::add_region_internal (boost::shared_ptr<Region> region, timepos_t const & position, ThawList& thawlist)
 {
 	if (region->data_type () != _type) {
 		return false;
@@ -1466,7 +1466,7 @@ Playlist::split_region (boost::shared_ptr<Region> region, timepos_t const & play
 }
 
 void
-Playlist::_split_region (boost::shared_ptr<Region> region, timepos_t const &  playlist_position, Thawlist& thawlist)
+Playlist::_split_region (boost::shared_ptr<Region> region, timepos_t const &  playlist_position, ThawList& thawlist)
 {
 	if (!region->covers (playlist_position)) {
 		return;
@@ -1551,14 +1551,14 @@ Playlist::SoloSelectedActive ()
 }
 
 void
-Playlist::ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist)
+Playlist::ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude)
 {
 	RegionWriteLock rl (this);
 	ripple_unlocked (at, distance, exclude, rl.thawlist);
 }
 
 void
-Playlist::ripple_unlocked (samplepos_t at, samplecnt_t distance, RegionList* exclude, ThawList& thawlist, bool notify)
+Playlist::ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist, bool notify)
 {
 	if (distance.zero()) {
 		return;