summaryrefslogtreecommitdiff
path: root/libs/surfaces/mackie/mcp_buttons.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-03 17:41:49 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-03 17:41:49 -0400
commitd074bc586e494d7dd83d415a487195a477095a4f (patch)
tree8748ae1d85ef796449dcd30cff6ba6f2196a4704 /libs/surfaces/mackie/mcp_buttons.cc
parent6bcdf4f0f106d0b83ed7f221f546c132585e19e7 (diff)
parent91b027a4a0c0e90398b9c6dbb5611b2acc4f2f8e (diff)
Merge branch 'master' into audioengine
Diffstat (limited to 'libs/surfaces/mackie/mcp_buttons.cc')
-rw-r--r--libs/surfaces/mackie/mcp_buttons.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 286e87a0fb..792813bf33 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -814,8 +814,12 @@ MackieControlProtocol::dyn_release (Button &)
LedState
MackieControlProtocol::flip_press (Button &)
{
- set_flip_mode (!_flip_mode);
- return (_flip_mode ? on : off);
+ if (_flip_mode != Normal) {
+ set_flip_mode (Normal);
+ } else {
+ set_flip_mode (Mirror);
+ }
+ return ((_flip_mode != Normal) ? on : off);
}
LedState
MackieControlProtocol::flip_release (Button &)