13
0

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.
This commit is contained in:
Len Ovens 2016-01-14 13:06:14 -08:00
parent aeaf0610d4
commit 0b58cde467
2 changed files with 7 additions and 14 deletions

View File

@ -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 &);

View File

@ -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&)
{