diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-09 19:06:52 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-09 19:06:52 +0000 |
commit | 71427323ec851ee6271dcc93f26dfc3bc0a51b1f (patch) | |
tree | 5ebdec0eacb93ae391e247105a50c6ac8a897dcc /libs/surfaces/mackie/mackie_control_protocol.h | |
parent | 94b6c7626c6e2b7ceda1ba1302aae2d10fd19e28 (diff) |
MCP: latest patch from Rodrigo:
* fixes Master Fader Touch button in the Mackie;
* implements a MasterFaderTouch global button;
* removes unused MackieControlProtocol::_transport_previously_rolling property;
* implements DeviceInfo::get_global_button() method;
* creates GlobalButtonsInfo and StripButtonsInfo types in DeviceInfo;
* implements Surface::_last_master_gain_written property to help master fader feedback;
* makes Surface respect _mcp.device_info().strip_cnt() to create master fader and when connecting signals for strips and master fader instead of using hardcoded 8;
* removed a few unnecessary updates in Surface::turn_it_on();
* included master_gain_changed() in Surface::periodic();
* implemented MackieControlProtocol::master_fader_touch_press and
* MackieControlProtocol::master_fader_touch_release;
git-svn-id: svn://localhost/ardour2/branches/3.0@12631 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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 5fab095cd7..7a9e34195e 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -266,7 +266,6 @@ class MackieControlProtocol PBD::ScopedConnectionList port_connections; PBD::ScopedConnectionList route_connections; PBD::ScopedConnectionList gui_connections; - bool _transport_previously_rolling; // timer for two quick marker left presses Mackie::Timer _frm_left_last; // last written timecode string @@ -450,6 +449,8 @@ class MackieControlProtocol Mackie::LedState user_b_release (Mackie::Button &); Mackie::LedState fader_touch_press (Mackie::Button &); Mackie::LedState fader_touch_release (Mackie::Button &); + Mackie::LedState master_fader_touch_press (Mackie::Button &); + Mackie::LedState master_fader_touch_release (Mackie::Button &); Mackie::LedState snapshot_press (Mackie::Button&); Mackie::LedState snapshot_release (Mackie::Button&); @@ -499,6 +500,4 @@ class MackieControlProtocol Mackie::LedState view_release (Mackie::Button&); }; - - #endif // ardour_mackie_control_protocol_h |