diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-01-14 13:06:14 -0800 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-01-14 13:06:14 -0800 |
| commit | 0b58cde467b0d3ed538fc71baabca2adec9bde8e (patch) | |
| tree | 6c6bbe71f8b33991e83155e2e761ebfef8fb9d3c | |
| parent | aeaf0610d42242ef5cabeac083f44c17c2ca6f4a (diff) | |
Mackie Control: Remove unused global_solo_* functions, moved functionality to clearsolo_* functions.
Changed to clear only rather than toggle and added Listen Clear as well.
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mcp_buttons.cc | 19 |
2 files changed, 7 insertions, 14 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 802d5a6235..a5e23403dc 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -423,8 +423,6 @@ class MackieControlProtocol Mackie::LedState channel_right_release(Mackie::Button &); Mackie::LedState clicking_press(Mackie::Button &); Mackie::LedState clicking_release(Mackie::Button &); - Mackie::LedState global_solo_press(Mackie::Button &); - Mackie::LedState global_solo_release(Mackie::Button &); Mackie::LedState marker_press(Mackie::Button &); Mackie::LedState marker_release(Mackie::Button &); Mackie::LedState save_press(Mackie::Button &); diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index b2fd79bcdf..d91cef0168 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -555,18 +555,6 @@ MackieControlProtocol::clicking_release (Button &) return Config->get_clicking(); } -LedState MackieControlProtocol::global_solo_press (Button &) -{ - bool state = !session->soloing(); - session->set_solo (session->get_routes(), state); - return state; -} - -LedState MackieControlProtocol::global_solo_release (Button &) -{ - return session->soloing(); -} - LedState MackieControlProtocol::enter_press (Button &) { @@ -859,16 +847,23 @@ MackieControlProtocol::write_release (Mackie::Button&) { return none; } + Mackie::LedState MackieControlProtocol::clearsolo_press (Mackie::Button&) { + // clears all solos and listens (pfl/afl) + session->set_solo (session->get_routes(), false); + session->set_listen (session->get_routes(), false); return none; } + Mackie::LedState MackieControlProtocol::clearsolo_release (Mackie::Button&) { + //return session->soloing(); return none; } + Mackie::LedState MackieControlProtocol::track_press (Mackie::Button&) { |