Implement new Enclosed region equivalence mode

[ardour.git] / libs / ardour / region.cc

diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index cad32cd4d7aa8cbe7893fa821a2599cccbaf1044..d4afb7d9c404729690d98021ac89f22c10d6f4a1 100644 (file)
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1478,7 +1478,14 @@ Region::overlap_equivalent (boost::shared_ptr<const Region> other) const
 }
 
 bool
-Region::equivalent (boost::shared_ptr<const Region> other) const
+Region::enclosed_equivalent (boost::shared_ptr<const Region> other) const
+{
+       return (first_sample() >= other->first_sample() && last_sample() <= other->last_sample()) ||
+              (first_sample() <= other->first_sample() && last_sample() >= other->last_sample()) ;
+}
+
+bool
+Region::exact_equivalent (boost::shared_ptr<const Region> other) const
 {
        return _start == other->_start &&
                _position == other->_position &&