From 906f7e1edd412c35fe16939f3599c76aa0735a89 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 4 Jul 2016 12:45:47 -0400
Subject: [PATCH] GUI doesn't need to listen to old ControlProtocol signals for
 stripable selection

---
 gtk2_ardour/editor.cc | 46 -------------------------------------------
 gtk2_ardour/editor.h  |  1 -
 2 files changed, 47 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3ee542b06a..4ce3ac55b8 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -805,10 +805,6 @@ Editor::Editor ()
 	ControlProtocol::VerticalZoomInSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_selected, this), gui_context());
 	ControlProtocol::VerticalZoomOutSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_selected, this), gui_context());
 
-	ControlProtocol::AddStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
-	ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
-	ControlProtocol::SetStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Set), gui_context());
-
 	BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
 
 	/* handle escape */
@@ -1010,48 +1006,6 @@ Editor::control_unselect ()
 	selection->clear_tracks ();
 }
 
-void
-Editor::control_select (PresentationInfo::order_t order, Selection::Operation op)
-{
-	/* handles the (static) signal from the ControlProtocol class that
-	 * requests setting the selected track to a given RID
-	 */
-
-	if (!_session) {
-		return;
-	}
-
-	boost::shared_ptr<Stripable> s = _session->get_remote_nth_stripable (order, PresentationInfo::AllStripables);
-
-	/* selected object may not be a Route */
-
-	boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
-
-	if (!r) {
-		return;
-	}
-
-	TimeAxisView* tav = axis_view_from_route (r);
-
-	if (tav) {
-		switch (op) {
-		case Selection::Add:
-			selection->add (tav);
-			break;
-		case Selection::Toggle:
-			selection->toggle (tav);
-			break;
-		case Selection::Extend:
-			break;
-		case Selection::Set:
-			selection->set (tav);
-			break;
-		}
-	} else {
-		selection->clear_tracks ();
-	}
-}
-
 void
 Editor::control_step_tracks_up ()
 {
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 4fe892504f..ee97886f9c 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1091,7 +1091,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
 	void control_step_tracks_down ();
 	void control_view (uint32_t);
 	void control_scroll (float);
-	void control_select (ARDOUR::PresentationInfo::order_t which, Selection::Operation);
 	void control_unselect ();
 	void access_action (std::string,std::string);
 	bool deferred_control_scroll (framepos_t);
-- 
2.30.2