diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-18 21:34:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-18 21:34:15 +0000 |
| commit | 95f5c3cc80bef3bcfc3d73a2e32e080b1d9b7fca (patch) | |
| tree | c99c670949ca488e3a4fa4e333915507019cb747 | |
| parent | 260db68a699f0d62463dd4d29b01d47441bf0f64 (diff) | |
MCP: some button handling fixes
git-svn-id: svn://localhost/ardour2/branches/3.0@12019 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/surfaces/mackie/device_info.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 1 | ||||
| -rw-r--r-- | mcp/nucleus.device | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc index 72512f3139..4df56d3a7a 100644 --- a/libs/surfaces/mackie/device_info.cc +++ b/libs/surfaces/mackie/device_info.cc @@ -116,11 +116,11 @@ DeviceInfo::logic_control_buttons () _global_buttons[Button::Aux] = GlobalButtonInfo ("aux", "view", 0x42); _global_buttons[Button::Busses] = GlobalButtonInfo ("busses", "view", 0x43); _global_buttons[Button::Outputs] = GlobalButtonInfo ("outputs", "view", 0x44); - _global_buttons[Button::User] = GlobalButtonInfo ("user_ready", "view", 0x45); - _global_buttons[Button::Shift] = GlobalButtonInfo ("ctrl", "modifiers", 0x46); + _global_buttons[Button::User] = GlobalButtonInfo ("user", "view", 0x45); + _global_buttons[Button::Shift] = GlobalButtonInfo ("shift", "modifiers", 0x46); _global_buttons[Button::Option] = GlobalButtonInfo ("option", "modifiers", 0x47); - _global_buttons[Button::Ctrl] = GlobalButtonInfo ("snapshot", "modifiers", 0x48); - _global_buttons[Button::CmdAlt] = GlobalButtonInfo ("shift", "modifiers", 0x49); + _global_buttons[Button::Ctrl] = GlobalButtonInfo ("ctrl", "modifiers", 0x48); + _global_buttons[Button::CmdAlt] = GlobalButtonInfo ("cmdalt", "modifiers", 0x49); _global_buttons[Button::Read] = GlobalButtonInfo ("read", "automation", 0x4a); _global_buttons[Button::Write] = GlobalButtonInfo ("write", "automation", 0x4b); _global_buttons[Button::Trim] = GlobalButtonInfo ("trim", "automation", 0x4c); diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index d753c80697..e7403e636d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1074,6 +1074,7 @@ MackieControlProtocol::handle_button_event (Surface& surface, Button& button, Bu switch (bs) { case press: surface.write (button.set_state ((this->*(bh.press)) (button))); + break; case release: surface.write (button.set_state ((this->*(bh.release)) (button))); break; diff --git a/mcp/nucleus.device b/mcp/nucleus.device index 9a08bc917b..ce9a546d6b 100644 --- a/mcp/nucleus.device +++ b/mcp/nucleus.device @@ -10,5 +10,5 @@ <GlobalControls value="yes"/> <JogWheel value="yes"/> <TouchSenseFaders value="yes"/> - <LogicControlButtons/> + <LogicControlButtons value="yes"/> </MackieProtocolDevice> |