waf build works on OS X ; new bindings file and processing system in place for mnemon...

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 3f6c282d3afbfd6f018fc7e721e670baa7af200c..cbe5975e87babae9ef2052abee340c235c56053c 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -19,10 +19,11 @@
 
 #include <algorithm>
 #include <sigc++/bind.h>
-#include <pbd/error.h>
-#include <pbd/stacktrace.h>
+#include "pbd/error.h"
+#include "pbd/stacktrace.h"
 
-#include <ardour/playlist.h>
+#include "ardour/playlist.h"
+#include "ardour/rc_configuration.h"
 
 #include "region_view.h"
 #include "selection.h"
@@ -33,6 +34,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace sigc;
@@ -268,18 +270,14 @@ Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
 void
 Selection::add (const list<TimeAxisView*>& track_list)
 {
-       bool changed = false;
+       list<TimeAxisView*> added = tracks.add (track_list);
 
-       for (list<TimeAxisView*>::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
-               if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
-                       void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
-                       (*i)->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), (*i)));
-                       tracks.push_back (*i);
-                       changed = true;
-               }
+       for (list<TimeAxisView*>::const_iterator i = added.begin(); i != added.end(); ++i) {
+               void (Selection::*pmf)(TimeAxisView*) = &Selection::remove;
+               (*i)->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), (*i)));
        }
        
-       if (changed) {
+       if (!added.empty()) {
                TracksChanged ();
        }
 }
@@ -335,7 +333,6 @@ Selection::add (const RegionSelection& rs)
        }
        
        if (changed) {
-               select_edit_group_regions ();
                RegionsChanged ();
        }
 }
@@ -495,7 +492,7 @@ Selection::remove (uint32_t selection_id)
 }
 
 void
-Selection::remove (nframes_t start, nframes_t end)
+Selection::remove (nframes_t /*start*/, nframes_t /*end*/)
 {
 }
 
@@ -588,7 +585,7 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end)
 
        if (track) {
                time.track = track;
-               time.group = track->edit_group();
+               time.group = track->route_group();
        } else {
                time.track = 0;
                time.group = 0;
@@ -744,24 +741,6 @@ Selection::add (vector<AutomationSelectable*>& autos)
        PointsChanged ();
 }
 
-void
-Selection::select_edit_group_regions ()
-{
-       std::set<RegionView*> regions_to_add;
-       
-       for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
-               vector<RegionView*> e;
-               editor->get_equivalent_regions (*i, e);
-               for (vector<RegionView*>::iterator j = e.begin(); j != e.end(); ++j) {
-                       regions_to_add.insert(*j);
-               }
-       }
-
-       for (std::set<RegionView*>::iterator i = regions_to_add.begin(); i != regions_to_add.end(); ++i) {
-               add (*i);
-       }
-}
-
 void
 Selection::set (Marker* m)
 {