Major Theme Manager changes, see ardour-dev

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 76767f539d398159927683c93d101489a5d62289..638a621428bd3e49ef63a6f349d23d4b197b2771 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -15,12 +15,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
 #include <sigc++/bind.h>
 #include <pbd/error.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/playlist.h>
 
@@ -67,6 +67,7 @@ operator== (const Selection& a, const Selection& b)
                a.redirects == b.redirects;
 }
 
+/** Clear everything from the Selection */
 void
 Selection::clear ()
 {
@@ -132,6 +133,8 @@ Selection::clear_playlists ()
        /* Selections own their playlists */
 
        for (PlaylistSelection::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               /* selections own their own regions, which are copies of the "originals". make them go away */
+               (*i)->drop_regions ();
                (*i)->release ();
        }
 
@@ -209,9 +212,9 @@ Selection::toggle (RegionView* r)
        RegionSelection::iterator i;
 
        if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) {
-               regions.add (r);
+               add (r);
        } else {
-               regions.erase (i);
+               remove (*i);
        }
 
        RegionsChanged ();
@@ -224,9 +227,9 @@ Selection::toggle (vector<RegionView*>& r)
 
        for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) {
                if ((i = find (regions.begin(), regions.end(), (*x))) == regions.end()) {
-                       regions.add ((*x));
+                       add ((*x));
                } else {
-                       regions.erase (i);
+                       remove (*x);
                }
        }
 
@@ -322,6 +325,7 @@ Selection::add (RegionView* r)
 {
        if (find (regions.begin(), regions.end(), r) == regions.end()) {
                regions.add (r);
+               add (&r->get_trackview());
                RegionsChanged ();
        }
 }
@@ -333,8 +337,10 @@ Selection::add (vector<RegionView*>& v)
 
        for (vector<RegionView*>::iterator i = v.begin(); i != v.end(); ++i) {
                if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
-                       regions.add ((*i));
-                       changed = true;
+                       changed = regions.add ((*i));
+                       if (changed) {
+                               add (&(*i)->get_trackview());
+                       }
                }
        }
 
@@ -542,12 +548,14 @@ void
 Selection::set (RegionView* r)
 {
        clear_regions ();
+       clear_tracks ();
        add (r);
 }
 
 void
 Selection::set (vector<RegionView*>& v)
 {
+       clear_tracks ();
        clear_regions ();
        // make sure to deselect any automation selections
        clear_points();
@@ -621,6 +629,52 @@ Selection::empty ()
                ;
 }
 
+void
+Selection::toggle (const vector<AutomationSelectable*>& autos)
+{
+       for (vector<AutomationSelectable*>::const_iterator x = autos.begin(); x != autos.end(); ++x) {
+               if ((*x)->get_selected()) {
+                       points.remove (**x);
+               } else {
+                       points.push_back (**x);
+               }
+
+               delete *x;
+       }
+
+       PointsChanged (); /* EMIT SIGNAL */
+}
+
+void
+Selection::toggle (list<Selectable*>& selectables)
+{
+       RegionView* rv;
+       AutomationSelectable* as;
+       vector<RegionView*> rvs;
+       vector<AutomationSelectable*> autos;
+
+       for (std::list<Selectable*>::iterator i = selectables.begin(); i != selectables.end(); ++i) {
+               if ((rv = dynamic_cast<RegionView*> (*i)) != 0) {
+                       rvs.push_back (rv);
+               } else if ((as = dynamic_cast<AutomationSelectable*> (*i)) != 0) {
+                       autos.push_back (as);
+               } else {
+                       fatal << _("programming error: ")
+                             << X_("unknown selectable type passed to Selection::toggle()")
+                             << endmsg;
+                       /*NOTREACHED*/
+               }
+       }
+
+       if (!rvs.empty()) {
+               toggle (rvs);
+       } 
+
+       if (!autos.empty()) {
+               toggle (autos);
+       } 
+}
+
 void
 Selection::set (list<Selectable*>& selectables)
 {
@@ -645,7 +699,7 @@ Selection::add (list<Selectable*>& selectables)
                        autos.push_back (as);
                } else {
                        fatal << _("programming error: ")
-                             << X_("unknown selectable type passed to Selection::set()")
+                             << X_("unknown selectable type passed to Selection::add()")
                              << endmsg;
                        /*NOTREACHED*/
                }
@@ -674,7 +728,6 @@ Selection::add (vector<AutomationSelectable*>& autos)
 {
        for (vector<AutomationSelectable*>::iterator i = autos.begin(); i != autos.end(); ++i) {
                points.push_back (**i);
-               delete *i;
        }
 
        PointsChanged ();