diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-15 11:17:12 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-15 11:17:12 -0400 |
| commit | 69a8fc43e2552d9d3c72f9117131ca6b9392093b (patch) | |
| tree | 5801431cf70df2f7d4e9019977e2aa37c052be7f /libs/surfaces | |
| parent | 2a6a16f980ff9181b138f7a30aedfbde4426a591 (diff) | |
| parent | fb1eefdd5e0fb4bce89634aba61196263cc91979 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 194e35a26f..5b772d9af5 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1383,7 +1383,7 @@ MackieControlProtocol::add_down_select_button (int surface, int strip) void MackieControlProtocol::remove_down_select_button (int surface, int strip) { - DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (surface<<8)|(strip&0xf)); + DownButtonList::iterator x = find (_down_select_buttons.begin(), _down_select_buttons.end(), (uint32_t) (surface<<8)|(strip&0xf)); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("removing surface %1 strip %2 from down select buttons\n", surface, strip)); if (x != _down_select_buttons.end()) { _down_select_buttons.erase (x); |