X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fmcp_buttons.cc;h=a08575fd7c5eb5d63965e14ad224ee5add250138;hb=4c13018656b2c655025c733a4056b53c3a93e941;hp=269d964423e1e2aff4c1a10b2f645f8e9c2113e2;hpb=71feea97a0894c07d973713f3c23634ddef2f56d;p=ardour.git diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 269d964423..a08575fd7c 100644 --- 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" @@ -34,7 +35,7 @@ #include "i18n.h" /* handlers for all buttons, broken into a separate file to avoid clutter in - * mackie_control_protocol.cc + * mackie_control_protocol.cc */ using std::string; @@ -53,25 +54,27 @@ LedState MackieControlProtocol::shift_release (Button &) { _modifier_state &= ~MODIFIER_SHIFT; - return on; + return off; } LedState MackieControlProtocol::option_press (Button &) { _modifier_state |= MODIFIER_OPTION; + access_action ("Editor/set-loop-from-edit-range"); return on; } LedState MackieControlProtocol::option_release (Button &) { _modifier_state &= ~MODIFIER_OPTION; - return on; + return off; } LedState MackieControlProtocol::control_press (Button &) { _modifier_state |= MODIFIER_CONTROL; DEBUG_TRACE (DEBUG::MackieControl, string_compose ("CONTROL Press: modifier state now set to %1\n", _modifier_state)); + access_action ("Editor/set-punch-from-edit-range"); return on; } LedState @@ -79,48 +82,57 @@ MackieControlProtocol::control_release (Button &) { _modifier_state &= ~MODIFIER_CONTROL; DEBUG_TRACE (DEBUG::MackieControl, string_compose ("CONTROL Release: modifier state now set to %1\n", _modifier_state)); - return on; + return off; } LedState MackieControlProtocol::cmd_alt_press (Button &) { _modifier_state |= MODIFIER_CMDALT; + access_action ("Editor/set-session-from-edit-range"); return on; } LedState MackieControlProtocol::cmd_alt_release (Button &) { _modifier_state &= ~MODIFIER_CMDALT; - return on; + return off; } -LedState +LedState MackieControlProtocol::left_press (Button &) { + if (_subview_mode != None) { + return none; + } + Sorted sorted = get_sorted_routes(); - uint32_t strip_cnt = n_strips (); + 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); } return on; } -LedState +LedState MackieControlProtocol::left_release (Button &) { - return off; + return none; } -LedState +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,42 +144,35 @@ 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 +LedState MackieControlProtocol::right_release (Button &) { - if (_zoom_mode) { - - } - - return off; + return none; } LedState MackieControlProtocol::cursor_left_press (Button& ) { - if (_zoom_mode) { + if (zoom_mode()) { - if (_modifier_state & MODIFIER_OPTION) { + if (main_modifier_state() & MODIFIER_OPTION) { /* reset selected tracks to default vertical zoom */ } else { ZoomOut (); /* EMIT SIGNAL */ } } else { float page_fraction; - if (_modifier_state == MODIFIER_CONTROL) { + if (main_modifier_state() == MODIFIER_CONTROL) { page_fraction = 1.0; - } else if (_modifier_state == MODIFIER_OPTION) { + } else if (main_modifier_state() == MODIFIER_OPTION) { page_fraction = 0.1; - } else if (_modifier_state == MODIFIER_SHIFT) { + } else if (main_modifier_state() == MODIFIER_SHIFT) { page_fraction = 2.0; } else { page_fraction = 0.25; @@ -188,20 +193,20 @@ MackieControlProtocol::cursor_left_release (Button&) LedState MackieControlProtocol::cursor_right_press (Button& ) { - if (_zoom_mode) { - - if (_modifier_state & MODIFIER_OPTION) { + if (zoom_mode()) { + + if (main_modifier_state() & MODIFIER_OPTION) { /* reset selected tracks to default vertical zoom */ } else { ZoomIn (); /* EMIT SIGNAL */ } } else { float page_fraction; - if (_modifier_state == MODIFIER_CONTROL) { + if (main_modifier_state() == MODIFIER_CONTROL) { page_fraction = 1.0; - } else if (_modifier_state == MODIFIER_OPTION) { + } else if (main_modifier_state() == MODIFIER_OPTION) { page_fraction = 0.1; - } else if (_modifier_state == MODIFIER_SHIFT) { + } else if (main_modifier_state() == MODIFIER_SHIFT) { page_fraction = 2.0; } else { page_fraction = 0.25; @@ -209,7 +214,7 @@ MackieControlProtocol::cursor_right_press (Button& ) ScrollTimeline (page_fraction); } - + return off; } @@ -222,9 +227,9 @@ MackieControlProtocol::cursor_right_release (Button&) LedState MackieControlProtocol::cursor_up_press (Button&) { - if (_zoom_mode) { - - if (_modifier_state & MODIFIER_CONTROL) { + if (zoom_mode()) { + + if (main_modifier_state() & MODIFIER_CONTROL) { VerticalZoomInSelected (); /* EMIT SIGNAL */ } else { VerticalZoomInAll (); /* EMIT SIGNAL */ @@ -244,8 +249,8 @@ MackieControlProtocol::cursor_up_release (Button&) LedState MackieControlProtocol::cursor_down_press (Button&) { - if (_zoom_mode) { - if (_modifier_state & MODIFIER_OPTION) { + if (zoom_mode()) { + if (main_modifier_state() & MODIFIER_OPTION) { VerticalZoomOutSelected (); /* EMIT SIGNAL */ } else { VerticalZoomOutAll (); /* EMIT SIGNAL */ @@ -262,9 +267,12 @@ MackieControlProtocol::cursor_down_release (Button&) return off; } -LedState +LedState MackieControlProtocol::channel_left_press (Button &) { + if (_subview_mode != None) { + return none; + } Sorted sorted = get_sorted_routes(); if (sorted.size() > n_strips()) { prev_track(); @@ -274,15 +282,18 @@ MackieControlProtocol::channel_left_press (Button &) } } -LedState +LedState MackieControlProtocol::channel_left_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::channel_right_press (Button &) { + if (_subview_mode != None) { + return none; + } Sorted sorted = get_sorted_routes(); if (sorted.size() > n_strips()) { next_track(); @@ -292,35 +303,41 @@ MackieControlProtocol::channel_right_press (Button &) } } -LedState +LedState MackieControlProtocol::channel_right_release (Button &) { return off; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::zoom_press (Mackie::Button &) { - _zoom_mode = !_zoom_mode; - return (_zoom_mode ? on : off); + return none; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::zoom_release (Mackie::Button &) { - return (_zoom_mode ? on : off); + if (_modifier_state & MODIFIER_ZOOM) { + _modifier_state &= ~MODIFIER_ZOOM; + } else { + _modifier_state |= MODIFIER_ZOOM; + } + + return (zoom_mode() ? on : off); } -Mackie::LedState +Mackie::LedState MackieControlProtocol::scrub_press (Mackie::Button &) { if (!surfaces.empty()) { - surfaces.front()->next_jog_mode (); + // surfaces.front()->next_jog_mode (); + _master_surface->next_jog_mode (); } return none; } -Mackie::LedState +Mackie::LedState MackieControlProtocol::scrub_release (Mackie::Button &) { return none; @@ -329,47 +346,43 @@ MackieControlProtocol::scrub_release (Mackie::Button &) LedState MackieControlProtocol::undo_press (Button&) { - if (_modifier_state & MODIFIER_SHIFT) { - Redo(); /* EMIT SIGNAL */ - } else { - Undo(); /* EMIT SIGNAL */ - } - return off; + toggle_punch_out (); + return none; } LedState MackieControlProtocol::undo_release (Button&) { - return off; + return none; } -LedState +LedState MackieControlProtocol::drop_press (Button &) { - session->remove_last_capture(); - return on; + access_action ("Editor/start-range-from-playhead"); + return none; } -LedState +LedState MackieControlProtocol::drop_release (Button &) { - return off; + return none; } -LedState +LedState MackieControlProtocol::save_press (Button &) { - session->save_state (""); - return on; + toggle_punch_in (); + return none; } -LedState +LedState MackieControlProtocol::save_release (Button &) { - return off; + return none; } -LedState +LedState MackieControlProtocol::timecode_beats_press (Button &) { switch (_timecode_type) { @@ -388,7 +401,7 @@ MackieControlProtocol::timecode_beats_press (Button &) return on; } -LedState +LedState MackieControlProtocol::timecode_beats_release (Button &) { return off; @@ -397,20 +410,41 @@ MackieControlProtocol::timecode_beats_release (Button &) ///////////////////////////////////// // Functions ///////////////////////////////////// -LedState +LedState MackieControlProtocol::marker_press (Button &) { - string markername; - - session->locations()->next_available_name (markername,"mcu"); - add_marker (markername); - + _modifier_state |= MODIFIER_MARKER; + marker_modifier_consumed_by_button = false; return on; } -LedState +LedState MackieControlProtocol::marker_release (Button &) { + _modifier_state &= ~MODIFIER_MARKER; + + if (marker_modifier_consumed_by_button) { + /* marker was used a modifier for some other button(s), so do + nothing + */ + return off; + } + + string markername; + + /* 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 off; } @@ -418,20 +452,25 @@ MackieControlProtocol::marker_release (Button &) // Transport Buttons ///////////////////////////////////// -LedState +LedState MackieControlProtocol::stop_press (Button &) { transport_stop (); + + if (main_modifier_state() == MODIFIER_SHIFT) { + session->midi_panic(); + } + return on; } -LedState +LedState MackieControlProtocol::stop_release (Button &) { return session->transport_stopped(); } -LedState +LedState MackieControlProtocol::play_press (Button &) { /* if we're already rolling at normal speed, and we're pressed @@ -442,29 +481,33 @@ MackieControlProtocol::play_press (Button &) return none; } -LedState +LedState MackieControlProtocol::play_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::record_press (Button &) { rec_enable_toggle (); return none; } -LedState +LedState MackieControlProtocol::record_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::rewind_press (Button &) { - if (_modifier_state == MODIFIER_CONTROL) { + if (modifier_state() & MODIFIER_MARKER) { + prev_marker (); + } else if (modifier_state() & MODIFIER_NUDGE) { + access_action ("Editor/nudge-playhead-backward"); + } else if (main_modifier_state() & MODIFIER_SHIFT) { goto_start (); } else { rewind (); @@ -472,16 +515,20 @@ MackieControlProtocol::rewind_press (Button &) return none; } -LedState +LedState MackieControlProtocol::rewind_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::ffwd_press (Button &) { - if (_modifier_state == MODIFIER_CONTROL) { + if (modifier_state() & MODIFIER_MARKER) { + next_marker (); + } else if (modifier_state() & MODIFIER_NUDGE) { + access_action ("Editor/nudge-playhead-forward"); + } else if (main_modifier_state() & MODIFIER_SHIFT) { goto_end(); } else { ffwd (); @@ -489,31 +536,27 @@ MackieControlProtocol::ffwd_press (Button &) return none; } -LedState +LedState MackieControlProtocol::ffwd_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::loop_press (Button &) { - if (_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 +LedState MackieControlProtocol::loop_release (Button &) { return none; } -LedState +LedState MackieControlProtocol::clicking_press (Button &) { bool state = !Config->get_clicking(); @@ -521,166 +564,180 @@ MackieControlProtocol::clicking_press (Button &) return state; } -LedState +LedState MackieControlProtocol::clicking_release (Button &) { return Config->get_clicking(); } -LedState MackieControlProtocol::global_solo_press (Button &) +LedState +MackieControlProtocol::enter_press (Button &) { - bool state = !session->soloing(); - session->set_solo (session->get_routes(), state); - return state; + access_action ("Transport/ToggleFollowEdits"); + return none; } -LedState MackieControlProtocol::global_solo_release (Button &) +LedState +MackieControlProtocol::enter_release (Button &) { - return session->soloing(); + return none; } LedState -MackieControlProtocol::enter_press (Button &) -{ - Enter(); /* EMIT SIGNAL */ - return off; -} +MackieControlProtocol::bank_release (Button& b, uint32_t basic_bank_num) +{ + if (_subview_mode != None) { + return none; + } -LedState -MackieControlProtocol::enter_release (Button &) -{ - return off; + uint32_t bank_num = basic_bank_num; + + if (b.long_press_count() > 0) { + bank_num = 8 + basic_bank_num; + } + + (void) switch_banks (n_strips() * bank_num); + + return on; } LedState -MackieControlProtocol::F1_press (Button &) -{ - return off; +MackieControlProtocol::F1_press (Button &b) +{ + return off; } LedState -MackieControlProtocol::F1_release (Button &) -{ - return off; +MackieControlProtocol::F1_release (Button &b) +{ + return bank_release (b, 0); } LedState -MackieControlProtocol::F2_press (Button &) -{ - return off; +MackieControlProtocol::F2_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F2_release (Button &) -{ - return off; +MackieControlProtocol::F2_release (Button &b) +{ + return bank_release (b, 1); } LedState -MackieControlProtocol::F3_press (Button &) -{ - return off; +MackieControlProtocol::F3_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F3_release (Button &) -{ - return off; +MackieControlProtocol::F3_release (Button &b) +{ + return bank_release (b, 2); } LedState -MackieControlProtocol::F4_press (Button &) -{ - return off; +MackieControlProtocol::F4_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F4_release (Button &) -{ - return off; +MackieControlProtocol::F4_release (Button &b) +{ + return bank_release (b, 3); } LedState -MackieControlProtocol::F5_press (Button &) -{ - return off; +MackieControlProtocol::F5_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F5_release (Button &) -{ - return off; +MackieControlProtocol::F5_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F6_press (Button &) -{ - return off; +MackieControlProtocol::F6_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F6_release (Button &) -{ - return off; +MackieControlProtocol::F6_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F7_press (Button &) -{ - return off; +MackieControlProtocol::F7_press (Button &) +{ + return off; } LedState -MackieControlProtocol::F7_release (Button &) -{ - return off; +MackieControlProtocol::F7_release (Button &) +{ + return off; } LedState -MackieControlProtocol::F8_press (Button &) -{ +MackieControlProtocol::F8_press (Button &) +{ CloseDialog (); /* EMIT SIGNAL */ - return off; + return off; } LedState -MackieControlProtocol::F8_release (Button &) -{ - return off; +MackieControlProtocol::F8_release (Button &) +{ + return off; } /* UNIMPLEMENTED */ LedState -MackieControlProtocol::pan_press (Button &) -{ - return off; +MackieControlProtocol::pan_press (Button &) +{ + /* XXX eventually pan may have its own subview mode */ + set_subview_mode (MackieControlProtocol::None, boost::shared_ptr()); + return none; } LedState -MackieControlProtocol::pan_release (Button &) -{ - return off; +MackieControlProtocol::pan_release (Button &) +{ + return none; } LedState -MackieControlProtocol::plugin_press (Button &) -{ - return off; +MackieControlProtocol::plugin_press (Button &) +{ + return off; } LedState -MackieControlProtocol::plugin_release (Button &) -{ - return off; +MackieControlProtocol::plugin_release (Button &) +{ + // 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); - return on; +MackieControlProtocol::eq_press (Button &) +{ + boost::shared_ptr r = first_selected_route (); + set_subview_mode (EQ, r); + return none; /* led state handled by set_subview_mode() */ + } LedState -MackieControlProtocol::eq_release (Button &) -{ +MackieControlProtocol::eq_release (Button &) +{ return none; } LedState -MackieControlProtocol::dyn_press (Button &) -{ - set_view_mode (Dynamics); - return on; +MackieControlProtocol::dyn_press (Button &) +{ + boost::shared_ptr r = first_selected_route (); + set_subview_mode (Dynamics, r); + return none; /* led state handled by set_subview_mode() */ } + LedState -MackieControlProtocol::dyn_release (Button &) -{ +MackieControlProtocol::dyn_release (Button &) +{ return none; } LedState -MackieControlProtocol::flip_press (Button &) -{ +MackieControlProtocol::flip_press (Button &) +{ if (_flip_mode != Normal) { set_flip_mode (Normal); } else { @@ -689,61 +746,63 @@ MackieControlProtocol::flip_press (Button &) return ((_flip_mode != Normal) ? on : off); } LedState -MackieControlProtocol::flip_release (Button &) -{ +MackieControlProtocol::flip_release (Button &) +{ return none; } LedState -MackieControlProtocol::name_value_press (Button &) -{ - return off; +MackieControlProtocol::name_value_press (Button &) +{ + return off; } LedState -MackieControlProtocol::name_value_release (Button &) -{ - return off; +MackieControlProtocol::name_value_release (Button &) +{ + return off; } LedState -MackieControlProtocol::touch_press (Button &) -{ - return off; +MackieControlProtocol::touch_press (Button &) +{ + return none; } LedState -MackieControlProtocol::touch_release (Button &) -{ - return off; +MackieControlProtocol::touch_release (Button &) +{ + set_automation_state (ARDOUR::Touch); + return none; } LedState -MackieControlProtocol::cancel_press (Button &) -{ - return off; +MackieControlProtocol::cancel_press (Button &) +{ + access_action ("Transport/ToggleExternalSync"); + return none; } LedState -MackieControlProtocol::cancel_release (Button &) -{ - return off; +MackieControlProtocol::cancel_release (Button &) +{ + return none; } LedState -MackieControlProtocol::user_a_press (Button &) -{ +MackieControlProtocol::user_a_press (Button &) +{ transport_play (session->transport_speed() == 1.0); - return off; + return off; } LedState -MackieControlProtocol::user_a_release (Button &) -{ - return off; +MackieControlProtocol::user_a_release (Button &) +{ + return off; } LedState -MackieControlProtocol::user_b_press (Button &) -{ +MackieControlProtocol::user_b_press (Button &) +{ transport_stop(); - return off; + return off; } LedState -MackieControlProtocol::user_b_release (Button &) -{ - return off; +MackieControlProtocol::user_b_release (Button &) +{ + return off; } LedState @@ -751,7 +810,7 @@ MackieControlProtocol::master_fader_touch_press (Mackie::Button &) { DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_press\n"); - Fader* master_fader = surfaces.front()->master_fader(); + Fader* master_fader = _master_surface->master_fader(); boost::shared_ptr ac = master_fader->control (); @@ -765,7 +824,7 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) { DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::master_fader_touch_release\n"); - Fader* master_fader = surfaces.front()->master_fader(); + Fader* master_fader = _master_surface->master_fader(); master_fader->set_in_use (false); master_fader->stop_touch (transport_frame(), true); @@ -773,209 +832,252 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) return none; } -Mackie::LedState -MackieControlProtocol::read_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::read_press (Mackie::Button&) { - _metering_active = !_metering_active; - notify_metering_state_changed (); - return _metering_active; + return none; } -Mackie::LedState -MackieControlProtocol::read_release (Mackie::Button&) + +Mackie::LedState +MackieControlProtocol::read_release (Mackie::Button&) { - return _metering_active; + set_automation_state (ARDOUR::Play); + return none; } -Mackie::LedState -MackieControlProtocol::write_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::write_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_release (Mackie::Button&) { + set_automation_state (ARDOUR::Write); return none; } -Mackie::LedState -MackieControlProtocol::clearsolo_press (Mackie::Button&) + +Mackie::LedState +MackieControlProtocol::clearsolo_press (Mackie::Button&) { + // clears all solos and listens (pfl/afl) + + if (session) { + if (session->soloing()) { + session->set_solo (session->get_routes(), false); + } else if (session->listening()) { + session->set_listen (session->get_routes(), false); + } + + session->clear_all_solo_state (session->get_routes()); // safeguard, ideally this won't do anything, check the log-window + } return none; } -Mackie::LedState -MackieControlProtocol::clearsolo_release (Mackie::Button&) + +Mackie::LedState +MackieControlProtocol::clearsolo_release (Mackie::Button&) { + //return session->soloing(); return none; } -Mackie::LedState -MackieControlProtocol::track_press (Mackie::Button&) -{ +Mackie::LedState +MackieControlProtocol::track_press (Mackie::Button&) +{ + set_subview_mode (TrackView, first_selected_route()); return none; } -Mackie::LedState -MackieControlProtocol::track_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::track_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::send_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::send_press (Mackie::Button&) { -// code moved here from "sends_press" - set_view_mode (Sends); - return on; -// return none; + boost::shared_ptr 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&) +Mackie::LedState +MackieControlProtocol::send_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::miditracks_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::miditracks_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::miditracks_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::miditracks_release (Mackie::Button&) { + set_view_mode (MidiTracks); return none; } -Mackie::LedState -MackieControlProtocol::inputs_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::inputs_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::inputs_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::inputs_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audiotracks_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audiotracks_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::audiotracks_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audiotracks_release (Mackie::Button&) { + set_view_mode (AudioTracks); return none; } -Mackie::LedState -MackieControlProtocol::audioinstruments_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::audioinstruments_press (Mackie::Button& b) { return none; } -Mackie::LedState -MackieControlProtocol::audioinstruments_release (Mackie::Button&) + +Mackie::LedState +MackieControlProtocol::audioinstruments_release (Mackie::Button& b) { return none; + } -Mackie::LedState -MackieControlProtocol::aux_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::aux_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::aux_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::aux_release (Mackie::Button&) { + set_view_mode (Auxes); return none; } -Mackie::LedState -MackieControlProtocol::busses_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::busses_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::busses_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::busses_release (Mackie::Button&) { + set_view_mode (Busses); return none; } -Mackie::LedState -MackieControlProtocol::outputs_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::outputs_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::outputs_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::outputs_release (Mackie::Button&) { + set_view_mode (Hidden); return none; } -Mackie::LedState -MackieControlProtocol::user_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::user_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::user_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::user_release (Mackie::Button&) { + set_view_mode (Selected); return none; } -Mackie::LedState -MackieControlProtocol::trim_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::trim_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::trim_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::trim_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::latch_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::latch_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::latch_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::latch_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::grp_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::grp_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::grp_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::grp_release (Mackie::Button&) { + /* There is no "Off" button for automation, + so we use Group for this purpose. + */ + set_automation_state (Off); return none; } -Mackie::LedState -MackieControlProtocol::nudge_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_press (Mackie::Button&) { - return none; + _modifier_state |= MODIFIER_NUDGE; + nudge_modifier_consumed_by_button = false; + return on; } -Mackie::LedState -MackieControlProtocol::nudge_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_release (Mackie::Button&) { - return none; + _modifier_state &= ~MODIFIER_NUDGE; + + /* XXX these action names are stupid, because the action can affect + * regions, markers or the playhead depending on selection state. + */ + + if (main_modifier_state() & MODIFIER_SHIFT) { + access_action ("Region/nudge-backward"); + } else { + access_action ("Region/nudge-forward"); + } + + return off; } -Mackie::LedState -MackieControlProtocol::replace_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::replace_press (Mackie::Button&) { - return none; + access_action ("Editor/finish-range-from-playhead"); + return off; } -Mackie::LedState -MackieControlProtocol::replace_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::replace_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::click_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::click_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::click_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::click_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::view_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::view_press (Mackie::Button&) { + set_view_mode (Mixer); return none; } -Mackie::LedState -MackieControlProtocol::view_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::view_release (Mackie::Button&) { return none; }