diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /libs/ardour/region.cc | |
parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) |
fix merge conflicts with master
Diffstat (limited to 'libs/ardour/region.cc')
-rw-r--r-- | libs/ardour/region.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 847a72b23f..1784cdbf3c 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1490,6 +1490,20 @@ Region::uses_source (boost::shared_ptr<const Source> source) const } } + for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) { + if (*i == source) { + return true; + } + + boost::shared_ptr<PlaylistSource> ps = boost::dynamic_pointer_cast<PlaylistSource> (*i); + + if (ps) { + if (ps->playlist()->uses_source (source)) { + return true; + } + } + } + return false; } |