diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-11 11:05:57 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-16 05:54:43 -0500 |
| commit | 8ba8f1c0b08bb1c8ffbb4f419806e0c05619808b (patch) | |
| tree | bdcf66336561a365b8a37be41eac62ce06481f40 /libs/surfaces/mackie/mackie_control_protocol.h | |
| parent | e302ce8662fb38a791d5c19da14fbce560bcbff2 (diff) | |
fix cherry-pick conflict
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 0239529cf2..a5ec5da4d1 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -109,8 +109,12 @@ class MackieControlProtocol Auxes, Selected, Plugins, - Dynamics, + }; + + enum SubViewMode { + None, EQ, + Dynamics, }; enum PotMode { @@ -145,6 +149,7 @@ class MackieControlProtocol FlipMode flip_mode () const { return _flip_mode; } ViewMode view_mode () const { return _view_mode; } + SubViewMode subview_mode () const { return _subview_mode; } PotMode pot_mode () const { return _pot_mode; } bool zoom_mode () const { return modifier_state() & MODIFIER_ZOOM; } bool metering_active () const { return _metering_active; } @@ -155,8 +160,10 @@ class MackieControlProtocol bool selected (boost::shared_ptr<ARDOUR::Route>) const; void set_view_mode (ViewMode); + void set_subview_mode (SubViewMode); void set_flip_mode (FlipMode); void set_pot_mode (PotMode); + void pot_mode_globals (); void display_view_mode (); XMLNode& get_state (); @@ -322,6 +329,7 @@ class MackieControlProtocol bool _scrub_mode; FlipMode _flip_mode; ViewMode _view_mode; + SubViewMode _subview_mode; PotMode _pot_mode; int _current_selected_track; int _modifier_state; |