diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-11 16:21:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-11 16:21:23 +0000 |
| commit | 20d38b1c25b9eaf3790ce148a74a0f708dabaa0c (patch) | |
| tree | 3df368d75eaae8eb1ff2c09a4552e81ddc73024b /libs/surfaces/mackie/mackie_control_protocol.h | |
| parent | b98efa7893b55ee775f50af96610f886631a4395 (diff) | |
MCP: make vpots control pan width + direction/position
git-svn-id: svn://localhost/ardour2/branches/3.0@11904 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index a4b2c0adb2..c89bfa2c10 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -83,6 +83,11 @@ class MackieControlProtocol , public AbstractUI<MackieControlUIRequest> { public: + static const int MODIFIER_OPTION; + static const int MODIFIER_CONTROL; + static const int MODIFIER_SHIFT; + static const int MODIFIER_CMDALT; + MackieControlProtocol(ARDOUR::Session &); virtual ~MackieControlProtocol(); @@ -279,6 +284,8 @@ class MackieControlProtocol ARDOUR::Session & get_session() { return *session; } void add_in_use_timeout (Mackie::Surface& surface, Mackie::Control& in_use_control, Mackie::Control* touch_control); + + int modifier_state(); protected: // shut down the surface @@ -363,12 +370,6 @@ class MackieControlProtocol bool _scrub_mode; bool _flip_mode; int _current_selected_track; - - static const int MODIFIER_OPTION; - static const int MODIFIER_CONTROL; - static const int MODIFIER_SHIFT; - static const int MODIFIER_CMDALT; - int _modifier_state; typedef std::list<GSource*> PortSources; |