smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

mackie: add new bindings for Save,Undo,Cancel,Enter

Browse source 
these now control punch in, punch out, external sync and follow edits, respectively
This commit is contained in:
Paul Davis 2016-02-01 12:22:01 -05:00
parent 5eccbbfbd6
commit ca813315bf
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1192,13 +1192,21 @@ MackieControlProtocol::update_timecode_display()
void MackieControlProtocol::notify_parameter_changed (std::string const & p) void MackieControlProtocol::notify_parameter_changed (std::string const & p)
{ {
if (p == "punch-in") { if (p == "punch-in") {
// no such button right now update_global_button (Button::Save, session->config.get_punch_in() ? flashing : off);
// update_global_button (Button::PunchIn, session->config.get_punch_in());
} else if (p == "punch-out") { } else if (p == "punch-out") {
// no such button right now update_global_button (Button::Undo, session->config.get_punch_out() ? flashing : off);
// update_global_button (Button::PunchOut, session->config.get_punch_out());
} else if (p == "clicking") { } else if (p == "clicking") {
update_global_button (Button::Click, Config->get_clicking()); update_global_button (Button::Click, Config->get_clicking());
} else if (p == "follow-edits") {
/* we can't respond to this at present, because "follow-edits"
* is a property of the (G)UI configuration object, to which we
* have no access. For now, this means that the lit state of
* this button (if there is one) won't reflect the setting.
*/
//update_global_button (Button::Enter, session->config.get_follow_edits() ? on : off);
} else if (p == "external-sync") {
update_global_button (Button::Cancel, session->config.get_external_sync() ? on : off);
} else { } else {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("parameter changed: %1\n", p)); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("parameter changed: %1\n", p));
} }

17
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -372,14 +372,14 @@ MackieControlProtocol::drop_release (Button &)
LedState LedState
MackieControlProtocol::save_press (Button &) MackieControlProtocol::save_press (Button &)
{ {
session->save_state (""); toggle_punch_in ();
return on; return none;
} }
LedState LedState
MackieControlProtocol::save_release (Button &) MackieControlProtocol::save_release (Button &)
{ {
return off; return none;
} }
LedState LedState
@ -573,14 +573,14 @@ MackieControlProtocol::clicking_release (Button &)
LedState LedState
MackieControlProtocol::enter_press (Button &) MackieControlProtocol::enter_press (Button &)
{ {
Enter(); /* EMIT SIGNAL */ access_action ("Transport/ToggleFollowEdits");
return off; return none;
} }
LedState LedState
MackieControlProtocol::enter_release (Button &) MackieControlProtocol::enter_release (Button &)
{ {
return off; return none;
} }
LedState LedState
@ -773,12 +773,13 @@ MackieControlProtocol::touch_release (Button &)
LedState LedState
MackieControlProtocol::cancel_press (Button &) MackieControlProtocol::cancel_press (Button &)
{ {
return off; access_action ("Transport/ToggleExternalSync");
return none;
} }
LedState LedState
MackieControlProtocol::cancel_release (Button &) MackieControlProtocol::cancel_release (Button &)
{ {
return off; return none;
} }
LedState LedState
MackieControlProtocol::user_a_press (Button &) MackieControlProtocol::user_a_press (Button &)