Button::AudioInstruments should not be lit without good reason.

[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 fb6fbd3e5ad4469be945e13dc4b39d1270dcec50..6652516cf93ad4bba5906453c5088d93ba8a1e73 100644 (file)
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -22,6 +22,7 @@
 #include "pbd/memento_command.h"
 
 #include "ardour/debug.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/location.h"
@@ -97,15 +98,19 @@ MackieControlProtocol::cmd_alt_release (Button &)
 LedState
 MackieControlProtocol::left_press (Button &)
 {
+       if (_subview_mode != None) {
+               return none;
+       }
+
        Sorted sorted = get_sorted_routes();
        uint32_t strip_cnt = n_strips ();
 
        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()));
        if (_current_initial_bank > 0) {
-               switch_banks ((_current_initial_bank - 1) / strip_cnt * strip_cnt);
+               (void) switch_banks ((_current_initial_bank - 1) / strip_cnt * strip_cnt);
        } else {
-               switch_banks (0);
+               (void) switch_banks (0);
        }
 
 
@@ -115,12 +120,16 @@ MackieControlProtocol::left_press (Button &)
 LedState
 MackieControlProtocol::left_release (Button &)
 {
-       return off;
+       return none;
 }
 
 LedState
 MackieControlProtocol::right_press (Button &)
 {
+       if (_subview_mode != None) {
+               return none;
+       }
+
        Sorted sorted = get_sorted_routes();
        uint32_t strip_cnt = n_strips();
        uint32_t route_cnt = sorted.size();
@@ -132,23 +141,16 @@ MackieControlProtocol::right_press (Button &)
 
        if (_current_initial_bank < max_bank) {
                uint32_t new_initial = (_current_initial_bank / strip_cnt * strip_cnt) + strip_cnt;
-
-               switch_banks (new_initial);
-       } else {
-               switch_banks (max_bank);
+               (void) switch_banks (new_initial);
        }
 
-       return on;
+       return none;
 }
 
 LedState
 MackieControlProtocol::right_release (Button &)
 {
-       if (zoom_mode()) {
-
-       }
-
-       return off;
+       return none;
 }
 
 LedState
@@ -265,6 +267,9 @@ MackieControlProtocol::cursor_down_release (Button&)
 LedState
 MackieControlProtocol::channel_left_press (Button &)
 {
+       if (_subview_mode != None) {
+               return none;
+       }
        Sorted sorted = get_sorted_routes();
        if (sorted.size() > n_strips()) {
                prev_track();
@@ -283,6 +288,9 @@ MackieControlProtocol::channel_left_release (Button &)
 LedState
 MackieControlProtocol::channel_right_press (Button &)
 {
+       if (_subview_mode != None) {
+               return none;
+       }
        Sorted sorted = get_sorted_routes();
        if (sorted.size() > n_strips()) {
                next_track();
@@ -408,7 +416,18 @@ MackieControlProtocol::marker_press (Button &)
 {
        string markername;
 
-       session->locations()->next_available_name (markername,"mcu");
+       /* Don't add another mark if one exists within 1/100th of a second of
+        * the current position and we're not rolling.
+        */
+
+
+       framepos_t where = session->audible_frame();
+
+       if (session->transport_stopped() && session->locations()->mark_at (where, session->frame_rate() / 100.0)) {
+               return off;
+       }
+
+       session->locations()->next_available_name (markername,"marker");
        add_marker (markername);
 
        return on;
@@ -504,13 +523,9 @@ MackieControlProtocol::ffwd_release (Button &)
 LedState
 MackieControlProtocol::loop_press (Button &)
 {
-       if (main_modifier_state() & MODIFIER_CONTROL) {
-               set_view_mode (Loop);
-               return on;
-       } else {
-               session->request_play_loop (!session->get_play_loop());
-               return none;
-       }
+       bool was_on = session->get_play_loop();
+       session->request_play_loop (!was_on);
+       return was_on ? off : on;
 }
 
 LedState
@@ -533,18 +548,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 &)
 {
@@ -561,13 +564,17 @@ MackieControlProtocol::enter_release (Button &)
 LedState
 MackieControlProtocol::bank_release (Button& b, uint32_t basic_bank_num)
 {
+       if (_subview_mode != None) {
+               return none;
+       }
+
        uint32_t bank_num = basic_bank_num;
 
        if (b.long_press_count() > 0) {
                bank_num = 8 + basic_bank_num;
        }
 
-       switch_banks (n_strips() * bank_num);
+       (void) switch_banks (n_strips() * bank_num);
 
        return on;
 }
@@ -659,7 +666,8 @@ MackieControlProtocol::F8_release (Button &)
 LedState
 MackieControlProtocol::pan_press (Button &)
 {
-       return off;
+       set_pot_mode (Pan);
+       return none;
 }
 LedState
 MackieControlProtocol::pan_release (Button &)
@@ -674,14 +682,17 @@ MackieControlProtocol::plugin_press (Button &)
 LedState
 MackieControlProtocol::plugin_release (Button &)
 {
-       return none;
+       // Do not do this yet, since it does nothing
+       // set_view_mode (Plugins);
+       return none; /* LED state set by set_view_mode */
 }
 LedState
 MackieControlProtocol::eq_press (Button &)
 {
-       //set_view_mode (EQ);
-       // not implemented yet, turn off (see comments for send button)
-       return off;
+       boost::shared_ptr<Route> r = first_selected_route ();
+       set_subview_mode (EQ, r);
+       return none; /* led state handled by set_subview_mode() */
+
 }
 LedState
 MackieControlProtocol::eq_release (Button &)
@@ -691,10 +702,11 @@ MackieControlProtocol::eq_release (Button &)
 LedState
 MackieControlProtocol::dyn_press (Button &)
 {
-       //set_view_mode (Dynamics);
-       // same as send
-       return off;
+       boost::shared_ptr<Route> r = first_selected_route ();
+       set_subview_mode (Dynamics, r);
+       return none; /* led state handled by set_subview_mode() */
 }
+
 LedState
 MackieControlProtocol::dyn_release (Button &)
 {
@@ -817,21 +829,28 @@ 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&)
 {
-
-       return off;
+       set_pot_mode (Trim);
+       return none;
 }
 Mackie::LedState
 MackieControlProtocol::track_release (Mackie::Button&)
@@ -841,13 +860,9 @@ MackieControlProtocol::track_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::send_press (Mackie::Button&)
 {
-// code moved here from "sends_press"
-       //set_view_mode (Sends);
-       // Led state for vpot assignment should be radio button-ish
-       // Pressing any one should turn the rest off.
-       // but this is not implemented yet so leave off
-       //return on;
-       return off;
+       boost::shared_ptr<Route> r = first_selected_route ();
+       set_subview_mode (Sends, r);
+       return none; /* led state handled by set_subview_mode() */
 }
 Mackie::LedState
 MackieControlProtocol::send_release (Mackie::Button&)
@@ -862,6 +877,7 @@ MackieControlProtocol::miditracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::miditracks_release (Mackie::Button&)
 {
+       set_view_mode (MidiTracks);
        return none;
 }
 Mackie::LedState
@@ -882,17 +898,20 @@ MackieControlProtocol::audiotracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::audiotracks_release (Mackie::Button&)
 {
+       set_view_mode (AudioTracks);
        return none;
 }
 Mackie::LedState
-MackieControlProtocol::audioinstruments_press (Mackie::Button&)
+MackieControlProtocol::audioinstruments_press (Mackie::Button& b)
 {
        return none;
 }
+
 Mackie::LedState
-MackieControlProtocol::audioinstruments_release (Mackie::Button&)
+MackieControlProtocol::audioinstruments_release (Mackie::Button& b)
 {
        return none;
+
 }
 Mackie::LedState
 MackieControlProtocol::aux_press (Mackie::Button&)
@@ -902,6 +921,7 @@ MackieControlProtocol::aux_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::aux_release (Mackie::Button&)
 {
+       set_view_mode (Auxes);
        return none;
 }
 Mackie::LedState
@@ -912,6 +932,7 @@ MackieControlProtocol::busses_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::busses_release (Mackie::Button&)
 {
+       set_view_mode (Busses);
        return none;
 }
 Mackie::LedState
@@ -922,6 +943,7 @@ MackieControlProtocol::outputs_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::outputs_release (Mackie::Button&)
 {
+       set_view_mode (Hidden);
        return none;
 }
 Mackie::LedState
@@ -932,6 +954,7 @@ MackieControlProtocol::user_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::user_release (Mackie::Button&)
 {
+       set_view_mode (Selected);
        return none;
 }
 Mackie::LedState
@@ -997,6 +1020,7 @@ MackieControlProtocol::click_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::view_press (Mackie::Button&)
 {
+       set_view_mode (Mixer);
        return none;
 }
 Mackie::LedState