Call PBD::EnumWriter::destroy in ARDOUR::cleanup (from

[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 6ded9a9d2088f48b522a82fa3e3b69067367c8f8..be51f016512173e057e0e8543bc2845b77213d20 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -102,16 +102,13 @@ MackieControlProtocol::left_press (Button &)
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left with current initial = %1 nstrips = %2 tracks/busses = %3\n",
                                                           _current_initial_bank, strip_cnt, route_cnt));
 
-       if (route_cnt && route_cnt > strip_cnt) {
-               if (_current_initial_bank > strip_cnt) {
-                       switch_banks (_current_initial_bank - strip_cnt);
-               } else {
-                       switch_banks (0);
-               }
-
-               return on;
+       if (_current_initial_bank > strip_cnt) {
+               switch_banks (_current_initial_bank - strip_cnt);
+       } else {
+               switch_banks (0);
        }
-       return off;
+
+       return on;
 }
 
 LedState 
@@ -128,15 +125,12 @@ MackieControlProtocol::right_press (Button &)
        uint32_t route_cnt = sorted.size();
 
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank right with current initial = %1 nstrips = %2 tracks/busses = %3\n",
-                                                          _current_initial_bank, strip_cnt, sorted.size()));
+                                                          _current_initial_bank, strip_cnt, route_cnt));
 
-       if (route_cnt && route_cnt > strip_cnt) {
-               uint32_t new_initial = std::min (_current_initial_bank + strip_cnt, route_cnt - 1);
-               switch_banks (new_initial);
-               return on;
-       }
+       uint32_t new_initial = std::min (_current_initial_bank + strip_cnt, route_cnt - 1);
+       switch_banks (new_initial);
 
-       return off;
+       return on;
 }
 
 LedState 
@@ -503,7 +497,7 @@ MackieControlProtocol::play_press (Button &)
           again, jump back to where we started last time
        */
 
-       transport_play (session->transport_rolling() == 1.0);
+       transport_play (session->transport_speed() == 1.0);
        return none;
 }
 
@@ -1015,12 +1009,14 @@ MackieControlProtocol::snapshot_release (Mackie::Button&)
 Mackie::LedState 
 MackieControlProtocol::read_press (Mackie::Button&) 
 {
-       return none;
+       _metering_active = !_metering_active;
+       notify_metering_state_changed ();
+       return _metering_active;
 }
 Mackie::LedState 
 MackieControlProtocol::read_release (Mackie::Button&) 
 {
-       return none;
+       return _metering_active;
 }
 Mackie::LedState 
 MackieControlProtocol::write_press (Mackie::Button&)