allow track selection to be toggled (ctrl-clicked); potential fixes for tape display offset stuff, but in progress

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

1 files changed, 17 insertions, 11 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c0fd7b0a20..76731ea439 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2828,33 +2828,29 @@ Editor::commit_reversible_command ()
 }
 
 bool
-Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool with_undo, bool no_remove)
+Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no_remove)
 {
 	bool commit = false;
 
-	if (!clicked_trackview) {
-		return false;
-	}
-
 	switch (op) {
 	case Selection::Toggle:
-		if (selection->selected (clicked_trackview)) {
+		if (selection->selected (&view)) {
 			if (!no_remove) {
-				selection->remove (clicked_trackview);
+				selection->remove (&view);
 				commit = true;
 			}
 		} else {
-			selection->add (clicked_trackview);
+			selection->add (&view);
 			commit = false;
 		}
 		break;
 
 	case Selection::Set:
-		if (selection->selected (clicked_trackview) && selection->tracks.size() == 1) {
+		if (selection->selected (&view) && selection->tracks.size() == 1) {
 			/* no commit necessary */
 		} 
 
-		selection->set (clicked_trackview);
+		selection->set (&view);
 		break;
 		
 	case Selection::Extend:
@@ -2866,7 +2862,17 @@ Editor::set_selected_track_from_click (bool press, Selection::Operation op, bool
 }
 
 bool
-Editor::set_selected_control_point_from_click (bool press, Selection::Operation op, bool with_undo, bool no_remove)
+Editor::set_selected_track_from_click (Selection::Operation op, bool no_remove)
+{
+	if (!clicked_trackview) {
+		return false;
+	}
+	
+	return set_selected_track (*clicked_trackview, op, no_remove);
+}
+
+bool
+Editor::set_selected_control_point_from_click (Selection::Operation op, bool no_remove)
 {
 	if (!clicked_control_point) {
 		return false;