diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-28 15:05:48 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-28 15:05:56 -0400 |
| commit | 54d5f36311d041ce3d5fa3e6ed14fde30bcb70b7 (patch) | |
| tree | 8bb084f1feea765dd33de4ace30c0c1030da40fc /libs/ardour/ardour/playlist.h | |
| parent | dbb26485df31bbf3bd0aeb83e3e01d42e25fbd07 (diff) | |
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)
Diffstat (limited to 'libs/ardour/ardour/playlist.h')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<Region>, framepos_t position, float times = 1, bool auto_partition = false); void remove_region (boost::shared_ptr<Region>); - void remove_region_by_source (boost::shared_ptr<Source>); void get_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&); void get_region_list_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&); void get_source_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&); @@ -181,7 +180,8 @@ public: bool region_is_shuffle_constrained (boost::shared_ptr<Region>); bool has_region_at (framepos_t const) const; - bool uses_source (boost::shared_ptr<const Source> src) const; + bool uses_source (boost::shared_ptr<const Source> src, bool shallow = false) const; + void deep_sources (std::set<boost::shared_ptr<Source> >&) const; framepos_t find_next_transient (framepos_t position, int dir); |