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 616cdc1e763451be2a208113a81921da97a9fe5a..be51f016512173e057e0e8543bc2845b77213d20 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -17,6 +17,8 @@
        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <algorithm>
+
 #include "pbd/memento_command.h"
 
 #include "ardour/debug.h"
@@ -94,25 +96,19 @@ LedState
 MackieControlProtocol::left_press (Button &)
 {
        Sorted sorted = get_sorted_routes();
-       uint32_t strip_cnt = n_strips ();
+       uint32_t strip_cnt = n_strips (); 
+       uint32_t route_cnt = sorted.size();
 
        DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank left 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 (sorted.size() > strip_cnt) {
-               int new_initial = _current_initial_bank - strip_cnt;
-               if (new_initial < 0) {
-                       new_initial = 0;
-               }
-               
-               if (new_initial != int (_current_initial_bank)) {
-                       switch_banks (new_initial);
-               }
-
-               return on;
+       if (_current_initial_bank > strip_cnt) {
+               switch_banks (_current_initial_bank - strip_cnt);
        } else {
-               return flashing;
+               switch_banks (0);
        }
+
+       return on;
 }
 
 LedState 
@@ -126,26 +122,15 @@ MackieControlProtocol::right_press (Button &)
 {
        Sorted sorted = get_sorted_routes();
        uint32_t strip_cnt = n_strips();
+       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 (sorted.size() > strip_cnt) {
-               uint32_t delta = sorted.size() - (strip_cnt + _current_initial_bank);
+       uint32_t new_initial = std::min (_current_initial_bank + strip_cnt, route_cnt - 1);
+       switch_banks (new_initial);
 
-               if (delta > strip_cnt) {
-                       delta = strip_cnt;
-               }
-               
-               if (delta > 0) {
-                       switch_banks (_current_initial_bank + delta);
-               }
-
-               return on;
-       } else {
-               return flashing;
-       }
-       return off;
+       return on;
 }
 
 LedState 
@@ -236,6 +221,8 @@ MackieControlProtocol::cursor_up_press (Button&)
                } else {
                        VerticalZoomInAll (); /* EMIT SIGNAL */
                }
+       } else {
+               StepTracksUp (); /* EMIT SIGNAL */
        }
        return off;
 }
@@ -255,6 +242,8 @@ MackieControlProtocol::cursor_down_press (Button&)
                } else {
                        VerticalZoomOutAll (); /* EMIT SIGNAL */
                }
+       } else {
+               StepTracksDown (); /* EMIT SIGNAL */
        }
        return off;
 }
@@ -317,14 +306,16 @@ MackieControlProtocol::zoom_release (Mackie::Button &)
 Mackie::LedState 
 MackieControlProtocol::scrub_press (Mackie::Button &)
 {
-       _scrub_mode = !_scrub_mode;
-       return (_scrub_mode ? on : off);
+       if (!surfaces.empty()) {
+               surfaces.front()->next_jog_mode ();
+       }
+       return none;
 }
 
 Mackie::LedState 
 MackieControlProtocol::scrub_release (Mackie::Button &)
 {
-       return (_scrub_mode ? on : off);
+       return none;
 }
 
 LedState
@@ -506,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;
 }
 
@@ -1018,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&)