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/region.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/region.h')
| -rw-r--r-- | libs/ardour/ardour/region.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 3a8a694c49..776a8a7966 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -197,7 +197,8 @@ class LIBARDOUR_API Region bool region_list_equivalent (boost::shared_ptr<const Region>) const; bool source_equivalent (boost::shared_ptr<const Region>) const; bool any_source_equivalent (boost::shared_ptr<const Region>) const; - bool uses_source (boost::shared_ptr<const Source>) const; + bool uses_source (boost::shared_ptr<const Source>, bool shallow = false) const; + void deep_sources (std::set<boost::shared_ptr<Source> >&) const; std::string source_string () const; @@ -310,7 +311,7 @@ class LIBARDOUR_API Region /** merges _onsets OR _transients with _user_transients into given list * if _onsets and _transients are unset, run analysis. * list is not thinned, duplicates remain in place. - * + * * intended for: Playlist::find_next_transient () */ virtual void get_transients (AnalysisFeatureList&) { |