diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-06 21:40:29 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-06 21:40:29 -0400 |
commit | 44fcbd988ccb0f8dc8bdecc71bf8baf820e0bad4 (patch) | |
tree | bac53cc1d11ca0cf4ca0dd7a9b6f624bd3dfef07 /libs/surfaces/mackie/mackie_control_protocol.h | |
parent | 77a8da9010320469d184a9e7e36957f9cb8880a5 (diff) |
mackie: ensure that the strip where select was pressed ends up as the first_selected_stripable
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 56ead71b50..8d63162ffc 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -170,6 +170,7 @@ class MackieControlProtocol boost::shared_ptr<Mackie::Surface> nth_surface (uint32_t) const; uint32_t global_index (Mackie::Strip&); + uint32_t global_index_locked (Mackie::Strip&); std::list<boost::shared_ptr<ARDOUR::Bundle> > bundles (); @@ -228,11 +229,11 @@ class MackieControlProtocol void add_down_button (ARDOUR::AutomationType, int surface, int strip); void remove_down_button (ARDOUR::AutomationType, int surface, int strip); - ControlList down_controls (ARDOUR::AutomationType); + ControlList down_controls (ARDOUR::AutomationType, uint32_t pressed); void add_down_select_button (int surface, int strip); void remove_down_select_button (int surface, int strip); - void select_range (); + void select_range (uint32_t pressed); int16_t ipmidi_base() const { return _ipmidi_base; } void set_ipmidi_base (int16_t); @@ -378,7 +379,7 @@ class MackieControlProtocol DownButtonMap _down_buttons; DownButtonList _down_select_buttons; - void pull_stripable_range (DownButtonList&, ARDOUR::StripableList&); + void pull_stripable_range (DownButtonList&, ARDOUR::StripableList&, uint32_t pressed); /* implemented button handlers */ Mackie::LedState stop_press(Mackie::Button &); |