Debug region/source removal
This commit is contained in:
parent
4bc8a3e9c7
commit
331efe835f
@ -426,7 +426,7 @@ protected:
|
|||||||
void ripple_locked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude);
|
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, bool notify = true);
|
void ripple_unlocked (timepos_t const & at, timecnt_t const & distance, RegionList *exclude, ThawList& thawlist, bool notify = true);
|
||||||
|
|
||||||
virtual void region_going_away (std::weak_ptr<Region> /*region*/) {}
|
virtual void region_going_away (std::weak_ptr<Region> /*region*/);
|
||||||
|
|
||||||
virtual XMLNode& state (bool) const;
|
virtual XMLNode& state (bool) const;
|
||||||
|
|
||||||
|
@ -662,6 +662,29 @@ Playlist::clear_pending ()
|
|||||||
pending_layering = false;
|
pending_layering = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
Playlist::region_going_away (std::weak_ptr<Region> region)
|
||||||
|
{
|
||||||
|
if (_session.deletion_in_progress ()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* Before a region can be destroyed it must already
|
||||||
|
* be removed from all playlists.
|
||||||
|
*/
|
||||||
|
#ifndef NDEBUG
|
||||||
|
std::shared_ptr<Region> r = region.lock();
|
||||||
|
if (!r) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
assert (find_region (r->id ()));
|
||||||
|
{
|
||||||
|
RegionReadLock rlock (this);
|
||||||
|
assert (all_regions.find (r) != all_regions.end());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
//remove_region (r);
|
||||||
|
}
|
||||||
|
|
||||||
/*************************************************************
|
/*************************************************************
|
||||||
* PLAYLIST OPERATIONS
|
* PLAYLIST OPERATIONS
|
||||||
*************************************************************/
|
*************************************************************/
|
||||||
|
Loading…
Reference in New Issue
Block a user