From 54d5f36311d041ce3d5fa3e6ed14fde30bcb70b7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 28 Jun 2016 15:05:48 -0400 Subject: changes in logic used by source cleanup to avoid endless recursion in sessions with deeply nested/recursive compound regions. This also fixes some potentially dangerous cleanup logic related to two sources with the same name (but different paths) --- libs/ardour/ardour/playlist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/ardour/playlist.h') diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index cc968e1833..7b19a08f6a 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -130,7 +130,6 @@ public: void add_region (boost::shared_ptr, framepos_t position, float times = 1, bool auto_partition = false); void remove_region (boost::shared_ptr); - void remove_region_by_source (boost::shared_ptr); void get_equivalent_regions (boost::shared_ptr, std::vector >&); void get_region_list_equivalent_regions (boost::shared_ptr, std::vector >&); void get_source_equivalent_regions (boost::shared_ptr, std::vector >&); @@ -181,7 +180,8 @@ public: bool region_is_shuffle_constrained (boost::shared_ptr); bool has_region_at (framepos_t const) const; - bool uses_source (boost::shared_ptr src) const; + bool uses_source (boost::shared_ptr src, bool shallow = false) const; + void deep_sources (std::set >&) const; framepos_t find_next_transient (framepos_t position, int dir); -- cgit v1.2.3