smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

add Stripable analogs for Route signals and methods in ControlProtocol

Browse source 
These will go away once all surfaces have migrated to Stripables
This commit is contained in:
Paul Davis 2016-05-16 16:36:01 -04:00
parent 96faa622ee
commit dd57a83793
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/surfaces/control_protocol/control_protocol.cc
View file

@ -46,13 +46,22 @@ PBD::Signal0<void> ControlProtocol::VerticalZoomOutAll;
PBD::Signal0<void> ControlProtocol::VerticalZoomInSelected; PBD::Signal0<void> ControlProtocol::VerticalZoomInSelected;
PBD::Signal0<void> ControlProtocol::VerticalZoomOutSelected; PBD::Signal0<void> ControlProtocol::VerticalZoomOutSelected;
PBD::Signal1<void,RouteNotificationListPtr> ControlProtocol::TrackSelectionChanged; PBD::Signal1<void,RouteNotificationListPtr> ControlProtocol::TrackSelectionChanged;
PBD::Signal0<void> ControlProtocol::StepTracksDown;
PBD::Signal0<void> ControlProtocol::StepTracksUp;
PBD::Signal1<void,uint64_t> ControlProtocol::AddRouteToSelection; PBD::Signal1<void,uint64_t> ControlProtocol::AddRouteToSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::SetRouteSelection; PBD::Signal1<void,uint64_t> ControlProtocol::SetRouteSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::ToggleRouteSelection; PBD::Signal1<void,uint64_t> ControlProtocol::ToggleRouteSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::RemoveRouteFromSelection; PBD::Signal1<void,uint64_t> ControlProtocol::RemoveRouteFromSelection;
PBD::Signal0<void> ControlProtocol::ClearRouteSelection; PBD::Signal0<void> ControlProtocol::ClearRouteSelection;
PBD::Signal0<void> ControlProtocol::StepTracksDown;
PBD::Signal0<void> ControlProtocol::StepTracksUp; PBD::Signal1<void,StripableNotificationListPtr> ControlProtocol::StripableSelectionChanged;
PBD::Signal1<void,uint64_t> ControlProtocol::AddStripableToSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::SetStripableSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::ToggleStripableSelection;
PBD::Signal1<void,uint64_t> ControlProtocol::RemoveStripableFromSelection;
PBD::Signal0<void> ControlProtocol::ClearStripableSelection;
const std::string ControlProtocol::state_node_name ("Protocol"); const std::string ControlProtocol::state_node_name ("Protocol");

7
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View file

@ -84,12 +84,19 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
static PBD::Signal1<void,uint64_t> RemoveRouteFromSelection; static PBD::Signal1<void,uint64_t> RemoveRouteFromSelection;
static PBD::Signal0<void> ClearRouteSelection; static PBD::Signal0<void> ClearRouteSelection;
static PBD::Signal1<void,uint64_t> AddStripableToSelection;
static PBD::Signal1<void,uint64_t> SetStripableSelection;
static PBD::Signal1<void,uint64_t> ToggleStripableSelection;
static PBD::Signal1<void,uint64_t> RemoveStripableFromSelection;
static PBD::Signal0<void> ClearStripableSelection;
/* signals that one UI (e.g. the GUI) can emit to get all other UI's to /* 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 respond. Typically this will always be GUI->"others" - the GUI pays
no attention to these signals. no attention to these signals.
*/ */
static PBD::Signal1<void,RouteNotificationListPtr> TrackSelectionChanged; static PBD::Signal1<void,RouteNotificationListPtr> TrackSelectionChanged;
static PBD::Signal1<void,StripableNotificationListPtr> StripableSelectionChanged;
/* the model here is as follows: /* the model here is as follows:

6
libs/surfaces/control_protocol/control_protocol/types.h
View file

@ -26,11 +26,15 @@
namespace ARDOUR { namespace ARDOUR {
class Route; class Route;
class Stripable;
typedef std::vector<boost::weak_ptr<ARDOUR::Route> > RouteNotificationList; typedef std::vector<boost::weak_ptr<ARDOUR::Route> > RouteNotificationList;
typedef boost::shared_ptr<RouteNotificationList> RouteNotificationListPtr; typedef boost::shared_ptr<RouteNotificationList> RouteNotificationListPtr;
typedef std::vector<boost::shared_ptr<ARDOUR::Route> > StrongRouteNotificationList; typedef std::vector<boost::shared_ptr<ARDOUR::Route> > StrongRouteNotificationList;
typedef std::vector<boost::weak_ptr<ARDOUR::Stripable> > StripableNotificationList;
typedef boost::shared_ptr<StripableNotificationList> StripableNotificationListPtr;
typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > StrongStripableNotificationList;
} }
#endif /* __ardour_control_protocol_types_h__ */ #endif /* __ardour_control_protocol_types_h__ */