try just removing all PLATFORM_WINDOWS conditionals in ipmidi code to see if it will...

[ardour.git] / libs / surfaces / mackie / mcp_buttons.cc

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 49550d2caf139a712b4ddb7164f8b32375393ea1..6885acc97e244781ab0a65fb38e875f97a2a69b6 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -839,8 +839,6 @@ MackieControlProtocol::track_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::send_press (Mackie::Button&)
 {
-       return none;
-       // remove above line when sends implemented
        set_pot_mode (Send);
        return none;
 }
@@ -857,11 +855,7 @@ MackieControlProtocol::miditracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::miditracks_release (Mackie::Button&)
 {
-       if (_view_mode == Mixer) {
-               _last_mix_bank = _current_initial_bank;
-       }
        set_view_mode (MidiTracks);
-       switch_banks(0, true);
        return none;
 }
 Mackie::LedState
@@ -882,11 +876,7 @@ MackieControlProtocol::audiotracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::audiotracks_release (Mackie::Button&)
 {
-       if (_view_mode == Mixer) {
-               _last_mix_bank = _current_initial_bank;
-       }
        set_view_mode (AudioTracks);
-       switch_banks(0, true);
        return none;
 }
 Mackie::LedState
@@ -907,11 +897,7 @@ MackieControlProtocol::aux_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::aux_release (Mackie::Button&)
 {
-       if (_view_mode == Mixer) {
-               _last_mix_bank = _current_initial_bank;
-       }
        set_view_mode (Auxes);
-       switch_banks(0, true);
        return none;
 }
 Mackie::LedState
@@ -922,11 +908,7 @@ MackieControlProtocol::busses_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::busses_release (Mackie::Button&)
 {
-       if (_view_mode == Mixer) {
-               _last_mix_bank = _current_initial_bank;
-       }
        set_view_mode (Busses);
-       switch_banks(0, true);
        return none;
 }
 Mackie::LedState
@@ -947,11 +929,7 @@ MackieControlProtocol::user_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::user_release (Mackie::Button&)
 {
-       if (_view_mode == Mixer) {
-               _last_mix_bank = _current_initial_bank;
-       }
        set_view_mode (Selected);
-       switch_banks(0, true);
        return none;
 }
 Mackie::LedState
@@ -1018,7 +996,6 @@ Mackie::LedState
 MackieControlProtocol::view_press (Mackie::Button&)
 {
        set_view_mode (Mixer);
-       switch_banks (_last_mix_bank, true);
        return none;
 }
 Mackie::LedState