Mackie Control: Remove unused global_solo_* functions, moved functionality to clearso...

Changed to clear only rather than toggle and added Listen Clear as well.

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 802d5a623531a4d68299bb3ea719090f23df9160..a5e23403dc69d2568017dce89a269d49f981b593 100644 (file)
--- 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 b2fd79bcdf431234895a9df002ac6bff6e69c8ac..d91cef0168c918844dd93335036b7e8cfc21198f 100644 (file)
--- 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&)
 {