MCP: some button handling fixes

git-svn-id: svn://localhost/ardour2/branches/3.0@12019 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 72512f3139aa4c237a457c74ce8a67527b2d6af1..4df56d3a7aaa105599f49dbe08bbfd2687426c53 100644 (file)
--- 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 d753c80697f7330e92a94c0b3e158f93ecf95313..e7403e636d57f9ecc58066dd69b8e3f92c3015eb 100644 (file)
--- 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 9a08bc917b149197f8f3c5f02ea1af835da7d8e2..ce9a546d6b1a4853e40fcc04e593d020163562e0 100644 (file)
--- 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>