diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-04 18:23:08 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-04 18:23:08 -0400 |
commit | c2f13633874b50bacb5de419f86ae084ffe46f3a (patch) | |
tree | 06c99e89d1406f8b0e37ac5ff709878295920c20 /libs/surfaces/mackie/surface.cc | |
parent | de2f4cc321457c7fdb23194812077089137a0151 (diff) | |
parent | 77723e900f888947b4354a7d7d4d7d9edf50e6b0 (diff) |
Merge branch 'ovenwerks-master'
Diffstat (limited to 'libs/surfaces/mackie/surface.cc')
-rw-r--r-- | libs/surfaces/mackie/surface.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index c513793fee..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 (); @@ -914,7 +915,7 @@ Surface::update_view_mode_display () break; case MackieControlProtocol::Sends: show_two_char_display ("Sn"); - id = Button::Sends; + id = Button::Send; break; case MackieControlProtocol::Plugins: show_two_char_display ("Pl"); |