From dd57a83793db78cfdfd8289aead08cc4121fc30d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 16 May 2016 16:36:01 -0400 Subject: [PATCH] add Stripable analogs for Route signals and methods in ControlProtocol These will go away once all surfaces have migrated to Stripables --- libs/surfaces/control_protocol/control_protocol.cc | 13 +++++++++++-- .../control_protocol/control_protocol.h | 7 +++++++ .../control_protocol/control_protocol/types.h | 6 +++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 2562edebcb..ab15dc705e 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -46,13 +46,22 @@ PBD::Signal0 ControlProtocol::VerticalZoomOutAll; PBD::Signal0 ControlProtocol::VerticalZoomInSelected; PBD::Signal0 ControlProtocol::VerticalZoomOutSelected; PBD::Signal1 ControlProtocol::TrackSelectionChanged; +PBD::Signal0 ControlProtocol::StepTracksDown; +PBD::Signal0 ControlProtocol::StepTracksUp; + PBD::Signal1 ControlProtocol::AddRouteToSelection; PBD::Signal1 ControlProtocol::SetRouteSelection; PBD::Signal1 ControlProtocol::ToggleRouteSelection; PBD::Signal1 ControlProtocol::RemoveRouteFromSelection; PBD::Signal0 ControlProtocol::ClearRouteSelection; -PBD::Signal0 ControlProtocol::StepTracksDown; -PBD::Signal0 ControlProtocol::StepTracksUp; + +PBD::Signal1 ControlProtocol::StripableSelectionChanged; +PBD::Signal1 ControlProtocol::AddStripableToSelection; +PBD::Signal1 ControlProtocol::SetStripableSelection; +PBD::Signal1 ControlProtocol::ToggleStripableSelection; +PBD::Signal1 ControlProtocol::RemoveStripableFromSelection; +PBD::Signal0 ControlProtocol::ClearStripableSelection; + const std::string ControlProtocol::state_node_name ("Protocol"); diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index d0294511f6..35a00c5496 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -84,12 +84,19 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope static PBD::Signal1 RemoveRouteFromSelection; static PBD::Signal0 ClearRouteSelection; + static PBD::Signal1 AddStripableToSelection; + static PBD::Signal1 SetStripableSelection; + static PBD::Signal1 ToggleStripableSelection; + static PBD::Signal1 RemoveStripableFromSelection; + static PBD::Signal0 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. */ static PBD::Signal1 TrackSelectionChanged; + static PBD::Signal1 StripableSelectionChanged; /* the model here is as follows: diff --git a/libs/surfaces/control_protocol/control_protocol/types.h b/libs/surfaces/control_protocol/control_protocol/types.h index 1d46753e51..d2e5d0772c 100644 --- a/libs/surfaces/control_protocol/control_protocol/types.h +++ b/libs/surfaces/control_protocol/control_protocol/types.h @@ -26,11 +26,15 @@ namespace ARDOUR { class Route; + class Stripable; typedef std::vector > RouteNotificationList; typedef boost::shared_ptr RouteNotificationListPtr; - typedef std::vector > StrongRouteNotificationList; + + typedef std::vector > StripableNotificationList; + typedef boost::shared_ptr StripableNotificationListPtr; + typedef std::vector > StrongStripableNotificationList; } #endif /* __ardour_control_protocol_types_h__ */