use session stripable selection API

and remove old ControlProtocol signals to talk to GUI etc.

2 files changed, 9 insertions, 6 deletions

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 1509602014..c919223e2c 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -27,6 +27,7 @@
 #include "pbd/signals.h"
 
 #include "ardour/types.h"
+#include "ardour/presentation_info.h"
 
 #include "timecode/time.h"
 
@@ -35,6 +36,7 @@
 namespace ARDOUR {
 	class Session;
 	class SessionEvent;
+	class Stripable;
 }
 
 class LIBCONTROLCP_API BasicUI {
@@ -44,7 +46,13 @@ class LIBCONTROLCP_API BasicUI {
 
 	void add_marker (const std::string& = std::string());
 	void remove_marker_at_playhead ();
-	
+
+	void clear_stripable_selection ();
+	void toggle_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
+	void add_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
+	void set_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
+	void toggle_selection (ARDOUR::PresentationInfo::order_t, ARDOUR::PresentationInfo::Flag);
+
 //	void mark_in();
 //	void mark_out();
 
diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index 53fce840e0..496ba99083 100644
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -78,11 +78,6 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
 	static PBD::Signal0<void> StepTracksDown;
 	static PBD::Signal0<void> StepTracksUp;
 
-	static PBD::Signal1<void,uint64_t> AddStripableSelection;
-	static PBD::Signal1<void,uint64_t> SetStripableSelection;
-	static PBD::Signal1<void,uint64_t> ToggleStripableSelection;
-	static PBD::Signal0<void>          ClearStripableSelection;
-
 	/* signals that one UI (e.g. the GUI) can emit to get all other UI's to
 	   respond. Typically this will always be GUI->"others" - the GUI pays
 	   no attention to these signals.