From ba3fc66aa587e5045000915105beae0edf33aad5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 4 May 2021 15:34:10 -0600 Subject: [PATCH] cleanup mess from manual rebase against master --- libs/ardour/ardour/playlist.h | 21 ++++----------------- libs/ardour/playlist.cc | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index a9f7ebd9c0..bc7e8542d2 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -303,36 +303,23 @@ protected: friend class Session; protected: - class ThawList : public RegionList { - public: - void add (boost::shared_ptr r) - { - if (std::find (begin(), end(), r) != end ()) { - return; - } - r->suspend_property_changes (); - push_back (r); - } - }; - class RegionReadLock : public Glib::Threads::RWLock::ReaderLock { public: RegionReadLock (Playlist* pl) - : Glib::Threads::RWLock::ReaderLock (pl->region_lock) + : Glib::Threads::RWLock::ReaderLock (pl->region_lock) { } ~RegionReadLock () {} - }; class RegionWriteLock : public Glib::Threads::RWLock::WriterLock { public: RegionWriteLock (Playlist* pl, bool do_block_notify = true) - : Glib::Threads::RWLock::WriterLock (pl->region_lock) - , playlist (pl) - , block_notify (do_block_notify) + : Glib::Threads::RWLock::WriterLock (pl->region_lock) + , playlist (pl) + , block_notify (do_block_notify) { if (block_notify) { playlist->delay_notifications (); diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 9f9726c735..5f9471da43 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -3081,7 +3081,7 @@ Playlist::combine (const RegionList& r) /* make position relative to zero */ - pl->add_region (copied_region, original_region->position().earlier (timecnt_t (earliest_position, earliest_position)), &thawlist); + pl->add_region_internal (copied_region, original_region->position().earlier (timecnt_t (earliest_position, earliest_position)), thawlist); /* use the maximum number of channels for any region */