ardour/livetrax
13
0
Fork 0
Code

MCP: some button handling fixes

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12019 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-18 21:34:15 +00:00
parent 260db68a69
commit 95f5c3cc80
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaces/mackie/device_info.cc
View File

@ -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);

1
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -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;

2
mcp/nucleus.device
View File

@ -10,5 +10,5 @@
<GlobalControls value="yes"/>
<JogWheel value="yes"/>
<TouchSenseFaders value="yes"/>
<LogicControlButtons/>
<LogicControlButtons value="yes"/>
</MackieProtocolDevice>