summaryrefslogtreecommitdiff
path: root/libs/ardour/playlist.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-01-24 17:22:34 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-01-24 17:22:34 +0000
commitd3187aa32a875347436f097905f661559650359c (patch)
treebdbda954d8a01e745ab88faed6a598b0447f3215 /libs/ardour/playlist.cc
parent14814f54692211d34acde52ae8adedeae04726cb (diff)
more region selection tweaks
git-svn-id: svn://localhost/ardour2/trunk@1379 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/playlist.cc')
-rw-r--r--libs/ardour/playlist.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 5ac877069e..19ff3894e8 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -599,11 +599,15 @@ Playlist::remove_region_internal (boost::shared_ptr<Region>region)
void
Playlist::get_equivalent_regions (boost::shared_ptr<Region> other, vector<boost::shared_ptr<Region> >& results)
{
- for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
- if (Config->get_use_overlap_equivalency()) {
+ if (Config->get_use_overlap_equivalency()) {
+ for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
if ((*i)->overlap_equivalent (other)) {
results.push_back ((*i));
- } else if ((*i)->equivalent (other)) {
+ }
+ }
+ } else {
+ for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+ if ((*i)->equivalent (other)) {
results.push_back ((*i));
}
}