allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

cleanup mess from manual rebase against master

Browse Source
This commit is contained in:
Paul Davis
2021-05-04 15:34:10 -06:00
parent 8cc54e5c7e
commit ba3fc66aa5
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/ardour/playlist.h
View File

@@ -303,36 +303,23 @@ protected:
friend class Session;
protected:
class ThawList : public RegionList {
public:
void add (boost::shared_ptr<Region> 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 ();

2
libs/ardour/playlist.cc
View File

@@ -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 */