diff options
author | Len Ovens <len@ovenwerks.net> | 2015-06-04 15:07:43 -0700 |
---|---|---|
committer | Len Ovens <len@ovenwerks.net> | 2015-06-04 15:07:43 -0700 |
commit | 71ae8d2abeee34b7f71410821246d43cd3476bb0 (patch) | |
tree | 8e96e4c776e45c65d12ed1ea9157f481aafa651f /libs/surfaces/mackie/surface.cc | |
parent | 71feea97a0894c07d973713f3c23634ddef2f56d (diff) |
Add an option in the MCP .device file to set master position (fixes #6357)
Diffstat (limited to 'libs/surfaces/mackie/surface.cc')
-rw-r--r-- | libs/surfaces/mackie/surface.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index dc79d5fa27..b918f67025 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -94,8 +94,9 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui } /* only the first Surface object has global controls */ - - if (_number == 0) { + /* lets use master_position instead */ + uint32_t mp = _mcp.device_info().master_position(); + if (_number == mp) { DEBUG_TRACE (DEBUG::MackieControl, "Surface is first. Might have global controls.\n"); if (_mcp.device_info().has_global_controls()) { init_controls (); |