Apply Select property of route groups at the Selection object level. Accordingly

simplify code related to selecting tracks.  Add a TrackViewList object rather than
"abusing" TrackSelection in lots of places.


git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 39 insertions, 13 deletions

diff --git a/gtk2_ardour/track_selection.cc b/gtk2_ardour/track_selection.cc
index d9c7f02e19..9aa29bdb6d 100755
--- a/gtk2_ardour/track_selection.cc
+++ b/gtk2_ardour/track_selection.cc
@@ -1,31 +1,57 @@
+/*
+    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 "track_selection.h"
+#include "time_axis_view.h"
+#include "public_editor.h"
 
 using namespace std;
 
-TrackSelection::TrackSelection (list<TimeAxisView*> const &t)
-	: list<TimeAxisView*> (t)
+TrackSelection::TrackSelection (PublicEditor const * e, TrackViewList const &t)
+	: TrackViewList (t)
+	, _editor (e)
 {
 
 }
 
-list<TimeAxisView*>
-TrackSelection::add (list<TimeAxisView*> const & t)
+TrackViewList
+TrackSelection::add (TrackViewList const & t)
 {
-	list<TimeAxisView*> 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->property (ARDOUR::RouteGroup::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 (TimeAxisView const * t) const
-{
-	return find (begin(), end(), t) != end();
-}