projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mackie: fix display of send level/fader level in send subview
[ardour.git]
/
libs
/
surfaces
/
mackie
/
mcp_buttons.cc
diff --git
a/libs/surfaces/mackie/mcp_buttons.cc
b/libs/surfaces/mackie/mcp_buttons.cc
index ff1b85874ff4a522870f1690f75649427f8dffaf..a08575fd7c5eb5d63965e14ad224ee5add250138 100644
(file)
--- a/
libs/surfaces/mackie/mcp_buttons.cc
+++ b/
libs/surfaces/mackie/mcp_buttons.cc
@@
-372,14
+372,14
@@
MackieControlProtocol::drop_release (Button &)
LedState
MackieControlProtocol::save_press (Button &)
{
LedState
MackieControlProtocol::save_press (Button &)
{
-
session->save_state (""
);
- return
on
;
+
toggle_punch_in (
);
+ return
none
;
}
LedState
MackieControlProtocol::save_release (Button &)
{
}
LedState
MackieControlProtocol::save_release (Button &)
{
- return
off
;
+ return
none
;
}
LedState
}
LedState
@@
-507,7
+507,7
@@
MackieControlProtocol::rewind_press (Button &)
prev_marker ();
} else if (modifier_state() & MODIFIER_NUDGE) {
access_action ("Editor/nudge-playhead-backward");
prev_marker ();
} else if (modifier_state() & MODIFIER_NUDGE) {
access_action ("Editor/nudge-playhead-backward");
- } else if (main_modifier_state()
==
MODIFIER_SHIFT) {
+ } else if (main_modifier_state()
&
MODIFIER_SHIFT) {
goto_start ();
} else {
rewind ();
goto_start ();
} else {
rewind ();
@@
-528,7
+528,7
@@
MackieControlProtocol::ffwd_press (Button &)
next_marker ();
} else if (modifier_state() & MODIFIER_NUDGE) {
access_action ("Editor/nudge-playhead-forward");
next_marker ();
} else if (modifier_state() & MODIFIER_NUDGE) {
access_action ("Editor/nudge-playhead-forward");
- } else if (main_modifier_state()
==
MODIFIER_SHIFT) {
+ } else if (main_modifier_state()
&
MODIFIER_SHIFT) {
goto_end();
} else {
ffwd ();
goto_end();
} else {
ffwd ();
@@
-573,14
+573,14
@@
MackieControlProtocol::clicking_release (Button &)
LedState
MackieControlProtocol::enter_press (Button &)
{
LedState
MackieControlProtocol::enter_press (Button &)
{
- Enter(); /* EMIT SIGNAL */
- return
off
;
+ access_action ("Transport/ToggleFollowEdits");
+ return
none
;
}
LedState
MackieControlProtocol::enter_release (Button &)
{
}
LedState
MackieControlProtocol::enter_release (Button &)
{
- return
off
;
+ return
none
;
}
LedState
}
LedState
@@
-688,7
+688,8
@@
MackieControlProtocol::F8_release (Button &)
LedState
MackieControlProtocol::pan_press (Button &)
{
LedState
MackieControlProtocol::pan_press (Button &)
{
- set_pot_mode (Pan);
+ /* XXX eventually pan may have its own subview mode */
+ set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<Route>());
return none;
}
LedState
return none;
}
LedState
@@
-773,12
+774,13
@@
MackieControlProtocol::touch_release (Button &)
LedState
MackieControlProtocol::cancel_press (Button &)
{
LedState
MackieControlProtocol::cancel_press (Button &)
{
- return off;
+ access_action ("Transport/ToggleExternalSync");
+ return none;
}
LedState
MackieControlProtocol::cancel_release (Button &)
{
}
LedState
MackieControlProtocol::cancel_release (Button &)
{
- return
off
;
+ return
none
;
}
LedState
MackieControlProtocol::user_a_press (Button &)
}
LedState
MackieControlProtocol::user_a_press (Button &)