X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fmcp_buttons.cc;h=6652516cf93ad4bba5906453c5088d93ba8a1e73;hb=d0668e55114be299cbf5e348c73588756e931cfe;hp=792813bf33d9798691d6d8b799a68eb94627235b;hpb=41f6f5574b499c7d0ef50ac35443be0c9e78c026;p=ardour.git diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index 792813bf33..6652516cf9 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,13 +35,14 @@ #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 namespace Mackie; +using std::string; using namespace ARDOUR; using namespace PBD; -using std::string; +using namespace ArdourSurface; +using namespace Mackie; LedState MackieControlProtocol::shift_press (Button &) @@ -52,7 +54,7 @@ LedState MackieControlProtocol::shift_release (Button &) { _modifier_state &= ~MODIFIER_SHIFT; - return on; + return off; } LedState MackieControlProtocol::option_press (Button &) @@ -64,7 +66,7 @@ LedState MackieControlProtocol::option_release (Button &) { _modifier_state &= ~MODIFIER_OPTION; - return on; + return off; } LedState MackieControlProtocol::control_press (Button &) @@ -78,7 +80,7 @@ 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 &) @@ -90,76 +92,84 @@ 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 > strip_cnt) { - switch_banks (_current_initial_bank - strip_cnt); + if (_current_initial_bank > 0) { + (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(); + uint32_t max_bank = route_cnt / strip_cnt * strip_cnt; + DEBUG_TRACE (DEBUG::MackieControl, string_compose ("bank right with current initial = %1 nstrips = %2 tracks/busses = %3\n", _current_initial_bank, strip_cnt, route_cnt)); - uint32_t new_initial = std::min (_current_initial_bank + strip_cnt, route_cnt - 1); - switch_banks (new_initial); + if (_current_initial_bank < max_bank) { + uint32_t new_initial = (_current_initial_bank / strip_cnt * strip_cnt) + strip_cnt; + (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; @@ -180,20 +190,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; @@ -201,7 +211,7 @@ MackieControlProtocol::cursor_right_press (Button& ) ScrollTimeline (page_fraction); } - + return off; } @@ -214,9 +224,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 */ @@ -236,8 +246,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 */ @@ -254,9 +264,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(); @@ -266,15 +279,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(); @@ -284,35 +300,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; @@ -321,7 +343,7 @@ MackieControlProtocol::scrub_release (Mackie::Button &) LedState MackieControlProtocol::undo_press (Button&) { - if (_modifier_state & MODIFIER_SHIFT) { + if (main_modifier_state() & MODIFIER_SHIFT) { Redo(); /* EMIT SIGNAL */ } else { Undo(); /* EMIT SIGNAL */ @@ -336,45 +358,32 @@ MackieControlProtocol::undo_release (Button&) } LedState -MackieControlProtocol::redo_press (Button&) -{ - Redo(); /* EMIT SIGNAL */ - return off; -} - -LedState -MackieControlProtocol::redo_release (Button&) -{ - return off; -} - -LedState MackieControlProtocol::drop_press (Button &) { session->remove_last_capture(); return on; } -LedState +LedState MackieControlProtocol::drop_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::save_press (Button &) { session->save_state (""); return on; } -LedState +LedState MackieControlProtocol::save_release (Button &) { return off; } -LedState +LedState MackieControlProtocol::timecode_beats_press (Button &) { switch (_timecode_type) { @@ -393,7 +402,7 @@ MackieControlProtocol::timecode_beats_press (Button &) return on; } -LedState +LedState MackieControlProtocol::timecode_beats_release (Button &) { return off; @@ -402,94 +411,52 @@ MackieControlProtocol::timecode_beats_release (Button &) ///////////////////////////////////// // Functions ///////////////////////////////////// -LedState +LedState MackieControlProtocol::marker_press (Button &) { string markername; - session->locations()->next_available_name (markername,"mcu"); - add_marker (markername); + /* Don't add another mark if one exists within 1/100th of a second of + * the current position and we're not rolling. + */ - return on; -} -LedState -MackieControlProtocol::marker_release (Button &) -{ - return off; -} - -///////////////////////////////////// -// Transport Buttons -///////////////////////////////////// + framepos_t where = session->audible_frame(); -LedState -MackieControlProtocol::frm_left_press (Button &) -{ - // can use first_mark_before/after as well - unsigned long elapsed = _frm_left_last.restart(); - - framepos_t pos = session->locations()->first_mark_before (session->transport_frame()); - - // allow a quick double to go past a previous mark - if (session->transport_rolling() && elapsed < 500 && pos >= 0) { - framepos_t pos_two_back = session->locations()->first_mark_before (pos); - if (pos_two_back >= 0) { - pos = pos_two_back; - } + if (session->transport_stopped() && session->locations()->mark_at (where, session->frame_rate() / 100.0)) { + return off; } - // move to the location, if it's valid - if (pos >= 0) { - session->request_locate (pos, session->transport_rolling()); - } else { - session->request_locate (session->current_start_frame(), session->transport_rolling()); - } + session->locations()->next_available_name (markername,"marker"); + add_marker (markername); return on; } -LedState -MackieControlProtocol::frm_left_release (Button &) +LedState +MackieControlProtocol::marker_release (Button &) { return off; } -LedState -MackieControlProtocol::frm_right_press (Button &) -{ - // can use first_mark_before/after as well - framepos_t pos = session->locations()->first_mark_after (session->transport_frame()); - - if (pos >= 0) { - session->request_locate (pos, session->transport_rolling()); - } else { - session->request_locate (session->current_end_frame(), session->transport_rolling()); - } - - return on; -} - -LedState -MackieControlProtocol::frm_right_release (Button &) -{ - return off; -} +///////////////////////////////////// +// Transport Buttons +///////////////////////////////////// -LedState +LedState MackieControlProtocol::stop_press (Button &) { transport_stop (); 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 @@ -500,29 +467,29 @@ 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 (main_modifier_state() == MODIFIER_CONTROL) { goto_start (); } else { rewind (); @@ -530,16 +497,16 @@ 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 (main_modifier_state() == MODIFIER_CONTROL) { goto_end(); } else { ffwd (); @@ -547,273 +514,207 @@ 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 -MackieControlProtocol::punch_in_press (Button &) -{ - bool const state = !session->config.get_punch_in(); - session->config.set_punch_in (state); - return state; -} - -LedState -MackieControlProtocol::punch_in_release (Button &) -{ - return session->config.get_punch_in(); -} - -LedState -MackieControlProtocol::punch_out_press (Button &) +LedState +MackieControlProtocol::clicking_press (Button &) { - bool const state = !session->config.get_punch_out(); - session->config.set_punch_out (state); + bool state = !Config->get_clicking(); + Config->set_clicking (state); return state; } -LedState -MackieControlProtocol::punch_out_release (Button &) -{ - return session->config.get_punch_out(); -} - -LedState -MackieControlProtocol::home_press (Button &) +LedState +MackieControlProtocol::clicking_release (Button &) { - session->goto_start(); - return on; + return Config->get_clicking(); } -LedState -MackieControlProtocol::home_release (Button &) +LedState +MackieControlProtocol::enter_press (Button &) { + Enter(); /* EMIT SIGNAL */ return off; } -LedState -MackieControlProtocol::end_press (Button &) -{ - session->goto_end(); - return on; -} - -LedState -MackieControlProtocol::end_release (Button &) +LedState +MackieControlProtocol::enter_release (Button &) { return off; } -LedState -MackieControlProtocol::clicking_press (Button &) +LedState +MackieControlProtocol::bank_release (Button& b, uint32_t basic_bank_num) { - bool state = !Config->get_clicking(); - Config->set_clicking (state); - return state; -} + if (_subview_mode != None) { + return none; + } -LedState -MackieControlProtocol::clicking_release (Button &) -{ - return Config->get_clicking(); -} + uint32_t bank_num = basic_bank_num; -LedState MackieControlProtocol::global_solo_press (Button &) -{ - bool state = !session->soloing(); - session->set_solo (session->get_routes(), state); - return state; -} + if (b.long_press_count() > 0) { + bank_num = 8 + basic_bank_num; + } -LedState MackieControlProtocol::global_solo_release (Button &) -{ - return session->soloing(); -} + (void) switch_banks (n_strips() * bank_num); -LedState -MackieControlProtocol::enter_press (Button &) -{ - Enter(); /* EMIT SIGNAL */ - return off; + return on; } LedState -MackieControlProtocol::enter_release (Button &) -{ +MackieControlProtocol::F1_press (Button &b) +{ return off; } - -LedState -MackieControlProtocol::F1_press (Button &) -{ - 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::io_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::io_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::sends_press (Button &) -{ - set_view_mode (Sends); - return on; -} -LedState -MackieControlProtocol::sends_release (Button &) -{ - return none; -} -LedState -MackieControlProtocol::pan_press (Button &) -{ - return off; +MackieControlProtocol::pan_press (Button &) +{ + set_pot_mode (Pan); + 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 { @@ -822,181 +723,61 @@ MackieControlProtocol::flip_press (Button &) return ((_flip_mode != Normal) ? on : off); } LedState -MackieControlProtocol::flip_release (Button &) -{ +MackieControlProtocol::flip_release (Button &) +{ return none; } LedState -MackieControlProtocol::edit_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::edit_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::name_value_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::name_value_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F9_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F9_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F10_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F10_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F11_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F11_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F12_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F12_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F13_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F13_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F14_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F14_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F15_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F15_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F16_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::F16_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::on_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::on_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::rec_ready_press (Button &) -{ - return off; -} -LedState -MackieControlProtocol::rec_ready_release (Button &) -{ - return off; -} -LedState -MackieControlProtocol::touch_press (Button &) -{ - return off; +MackieControlProtocol::name_value_press (Button &) +{ + return off; } LedState -MackieControlProtocol::touch_release (Button &) -{ - return off; +MackieControlProtocol::name_value_release (Button &) +{ + return off; } LedState -MackieControlProtocol::cancel_press (Button &) -{ - return off; +MackieControlProtocol::touch_press (Button &) +{ + return off; } LedState -MackieControlProtocol::cancel_release (Button &) -{ - return off; +MackieControlProtocol::touch_release (Button &) +{ + return off; } LedState -MackieControlProtocol::mixer_press (Button &) -{ - return off; +MackieControlProtocol::cancel_press (Button &) +{ + return off; } LedState -MackieControlProtocol::mixer_release (Button &) -{ - return off; +MackieControlProtocol::cancel_release (Button &) +{ + return off; } 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 @@ -1004,7 +785,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 (); @@ -1018,7 +799,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); @@ -1026,225 +807,224 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &) return none; } -Mackie::LedState -MackieControlProtocol::snapshot_press (Mackie::Button&) -{ - return none; -} -Mackie::LedState -MackieControlProtocol::snapshot_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; } -Mackie::LedState -MackieControlProtocol::read_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::read_release (Mackie::Button&) { return _metering_active; } -Mackie::LedState -MackieControlProtocol::write_press (Mackie::Button&) -{ - return none; -} -Mackie::LedState -MackieControlProtocol::write_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::fdrgroup_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::write_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::fdrgroup_release (Mackie::Button&) -{ - return none; -} -Mackie::LedState -MackieControlProtocol::clearsolo_press (Mackie::Button&) + +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&) + +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_pot_mode (Trim); 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&) { - 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&) { return none; } -Mackie::LedState -MackieControlProtocol::nudge_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_press (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::nudge_release (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::nudge_release (Mackie::Button&) { return none; } -Mackie::LedState -MackieControlProtocol::replace_press (Mackie::Button&) +Mackie::LedState +MackieControlProtocol::replace_press (Mackie::Button&) { return none; } -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; }