Merge with trunk R2920.

git-svn-id: svn://localhost/ardour2/trunk@2921 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 33 insertions, 17 deletions

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index fac18393af..910cebc7fe 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -296,32 +296,36 @@ Selection::add (TimeAxisView* track)
 }
 
 void
-Selection::add (const RegionSelection& rs)
+Selection::add (vector<RegionView*>& v)
 {
-	if (!rs.empty()) {
-		regions.insert (regions.end(), rs.begin(), rs.end());
-		RegionsChanged(); /* EMIT SIGNAL */
-	}
-}
+	/* XXX This method or the add (const RegionSelection&) needs to go
+	 */
 
-void
-Selection::add (RegionView* r)
-{
-	if (find (regions.begin(), regions.end(), r) == regions.end()) {
-		regions.add (r);
-		if (Config->get_link_region_and_track_selection()) {
-			add (&r->get_trackview());
+	bool changed = false;
+	
+	for (vector<RegionView*>::iterator i = v.begin(); i != v.end(); ++i) {
+		if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
+			changed = regions.add ((*i));
+			if (Config->get_link_region_and_track_selection() && changed) {
+				add (&(*i)->get_trackview());
+			}
 		}
+	}
+
+	if (changed) {
 		RegionsChanged ();
 	}
 }
 
 void
-Selection::add (vector<RegionView*>& v)
+Selection::add (const RegionSelection& rs)
 {
-	bool changed = false;
+	/* XXX This method or the add (const vector<RegionView*>&) needs to go
+	 */
 
-	for (vector<RegionView*>::iterator i = v.begin(); i != v.end(); ++i) {
+	bool changed = false;
+	
+	for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
 		if (find (regions.begin(), regions.end(), (*i)) == regions.end()) {
 			changed = regions.add ((*i));
 			if (Config->get_link_region_and_track_selection() && changed) {
@@ -329,13 +333,25 @@ Selection::add (vector<RegionView*>& v)
 			}
 		}
 	}
-
+	
 	if (changed) {
 		select_edit_group_regions ();
 		RegionsChanged ();
 	}
 }
 
+void
+Selection::add (RegionView* r)
+{
+	if (find (regions.begin(), regions.end(), r) == regions.end()) {
+		regions.add (r);
+		if (Config->get_link_region_and_track_selection()) {
+			add (&r->get_trackview());
+		}
+		RegionsChanged ();
+	}
+}
+
 long
 Selection::add (nframes_t start, nframes_t end)
 {