summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-01-29 14:47:40 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2016-01-29 16:15:41 -0500
commit42fbb966742e628a7211b5ce89cb2114270baf2f (patch)
tree68a4c8447030c5fa4dc9d66fcbc5781e74714bb9
parent9088944db2e713c90b977788db5d0e72cfa39d61 (diff)
mackie: make group button (appear) to do something
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc1
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.h1
-rw-r--r--libs/surfaces/mackie/mcp_buttons.cc3
3 files changed, 4 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index e7fbabc1c2..13ef34db3f 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -123,6 +123,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
, _initialized (false)
, configuration_state (0)
, state_version (0)
+ , _group_on (false)
{
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index e1f7ec06d1..578232184c 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -355,6 +355,7 @@ class MackieControlProtocol
XMLNode* configuration_state;
int state_version;
int _last_bank[9];
+ bool _group_on;
boost::shared_ptr<ArdourSurface::Mackie::Surface> _master_surface;
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 6652516cf9..f82117c139 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -985,7 +985,8 @@ MackieControlProtocol::grp_press (Mackie::Button&)
Mackie::LedState
MackieControlProtocol::grp_release (Mackie::Button&)
{
- return none;
+ _group_on = !_group_on;
+ return _group_on;
}
Mackie::LedState
MackieControlProtocol::nudge_press (Mackie::Button&)