Sanitize "well-known" ctrl API

[ardour.git] / gtk2_ardour / region_selection.cc

diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index 2a3a3074595ba3544ed43c7c210552b2a6921b8b..2679cc93816e89a583ba99f087a53d8e52355834 100644 (file)
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -87,6 +87,16 @@ bool RegionSelection::contains (RegionView* rv) const
        return find (begin(), end(), rv) != end();
 }
 
+bool RegionSelection::contains (boost::shared_ptr<ARDOUR::Region> region) const
+{
+       for (const_iterator r = begin (); r != end (); ++r) {
+               if ((*r)->region () == region) {
+                       return true;
+               }
+       }
+       return false;
+}
+
 /** Add a region to the selection.
  *  @param rv Region to add.
  *  @return false if we already had the region or if it cannot be added,
@@ -95,7 +105,7 @@ bool RegionSelection::contains (RegionView* rv) const
 bool
 RegionSelection::add (RegionView* rv)
 {
-        if (!rv->region()->playlist()) {
+       if (!rv->region()->playlist()) {
                 /* not attached to a playlist - selection not allowed.
                    This happens if the user tries to select a region
                    during a capture pass.
@@ -139,7 +149,7 @@ RegionSelection::remove (RegionView* rv)
 
                // remove from layer sorted list
                _bylayer.remove (rv);
-
+               pending.remove (rv->region()->id());
                erase (r);
                return true;
        }