X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftrack_selection.cc;h=6937eb623d904e59c2efee001527bccee13f0cb9;hb=65eeeb7a652d7022783b10e35941ce56e0fc7207;hp=fd73d97699ace927965f58823d27bd5d6c28ddc6;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git

diff --git a/gtk2_ardour/track_selection.cc b/gtk2_ardour/track_selection.cc
old mode 100755
new mode 100644
index fd73d97699..6937eb623d
--- a/gtk2_ardour/track_selection.cc
+++ b/gtk2_ardour/track_selection.cc
@@ -1,31 +1,62 @@
+/*
+    Copyright (C) 2000-2009 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <algorithm>
+
+#include "ardour/route_group.h"
+#include "control_protocol/control_protocol.h"
+
 #include "track_selection.h"
+#include "time_axis_view.h"
+#include "public_editor.h"
 
 using namespace std;
 
-TrackSelection::TrackSelection (list<TimeAxisViewPtr> const &t)
-	: list<TimeAxisViewPtr> (t)
+TrackSelection::TrackSelection (PublicEditor const * e, TrackViewList const &t)
+	: TrackViewList (t)
+	, _editor (e)
 {
+}
 
+TrackSelection::~TrackSelection ()
+{
 }
 
-list<TimeAxisViewPtr>
-TrackSelection::add (list<TimeAxisViewPtr> const & t)
+TrackViewList
+TrackSelection::add (TrackViewList const & t)
 {
-	list<TimeAxisViewPtr> added;
+	TrackViewList added = TrackViewList::add (t);
 
 	for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
-		if (!contains (*i)) {
-			added.push_back (*i);
-			push_back (*i);
+
+		/* select anything in the same select-enabled route group */
+		ARDOUR::RouteGroup* rg = (*i)->route_group ();
+		if (rg && rg->is_active() && rg->is_select ()) {
+			TrackViewList tr = _editor->axis_views_from_routes (rg->route_list ());
+			for (TrackViewList::iterator j = tr.begin(); j != tr.end(); ++j) {
+				if (!contains (*j)) {
+					added.push_back (*j);
+					push_back (*j);
+				}
+			}
 		}
 	}
 
 	return added;
 }
-
-bool
-TrackSelection::contains (TimeAxisViewConstPtr t) const
-{
-	return find (begin(), end(), t) != end();
-}