X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fmcp_buttons.cc;h=78d9596a9fb7a4d1b791d7ab27a5b38b33474d33;hb=99a53ed7f0840fea95baec5bf91d6b766b4372e6;hp=49550d2caf139a712b4ddb7164f8b32375393ea1;hpb=7a453d232923fc287f93bb0910e9c0bafc375a57;p=ardour.git

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 49550d2caf..78d9596a9f 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"
@@ -59,6 +60,7 @@ LedState
 MackieControlProtocol::option_press (Button &)
 {
 	_modifier_state |= MODIFIER_OPTION;
+	access_action ("Editor/set-loop-from-edit-range");
 	return on;
 }
 LedState
@@ -72,6 +74,7 @@ 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
@@ -85,6 +88,7 @@ LedState
 MackieControlProtocol::cmd_alt_press (Button &)
 {
 	_modifier_state |= MODIFIER_CMDALT;
+	access_action ("Editor/set-session-from-edit-range");
 	return on;
 }
 LedState
@@ -97,15 +101,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 +123,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 +144,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 +270,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 +291,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();
@@ -335,44 +346,40 @@ MackieControlProtocol::scrub_release (Mackie::Button &)
 LedState
 MackieControlProtocol::undo_press (Button&)
 {
-	if (main_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
 MackieControlProtocol::drop_press (Button &)
 {
-	session->remove_last_capture();
-	return on;
+	access_action ("Editor/start-range-from-playhead");
+	return none;
 }
 
 LedState
 MackieControlProtocol::drop_release (Button &)
 {
-	return off;
+	return none;
 }
 
 LedState
 MackieControlProtocol::save_press (Button &)
 {
-	session->save_state ("");
-	return on;
+	toggle_punch_in ();
+	return none;
 }
 
 LedState
 MackieControlProtocol::save_release (Button &)
 {
-	return off;
+	return none;
 }
 
 LedState
@@ -406,17 +413,38 @@ MackieControlProtocol::timecode_beats_release (Button &)
 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
 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;
 }
 
@@ -428,6 +456,11 @@ LedState
 MackieControlProtocol::stop_press (Button &)
 {
 	transport_stop ();
+
+	if (main_modifier_state() == MODIFIER_SHIFT) {
+		session->midi_panic();
+	}
+
 	return on;
 }
 
@@ -470,7 +503,11 @@ MackieControlProtocol::record_release (Button &)
 LedState
 MackieControlProtocol::rewind_press (Button &)
 {
-	if (main_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 ();
@@ -487,7 +524,11 @@ MackieControlProtocol::rewind_release (Button &)
 LedState
 MackieControlProtocol::ffwd_press (Button &)
 {
-	if (main_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 ();
@@ -529,41 +570,33 @@ 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 &)
 {
-	Enter(); /* EMIT SIGNAL */
-	return off;
+	access_action ("Transport/ToggleFollowEdits");
+	return none;
 }
 
 LedState
 MackieControlProtocol::enter_release (Button &)
 {
-	return off;
+	return none;
 }
 
 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;
 }
@@ -655,7 +688,8 @@ MackieControlProtocol::F8_release (Button &)
 LedState
 MackieControlProtocol::pan_press (Button &)
 {
-	set_pot_mode (Pan);
+	/* XXX eventually pan may have its own subview mode */
+	set_subview_mode (MackieControlProtocol::None, boost::shared_ptr<Route>());
 	return none;
 }
 LedState
@@ -671,15 +705,17 @@ MackieControlProtocol::plugin_press (Button &)
 LedState
 MackieControlProtocol::plugin_release (Button &)
 {
-	set_view_mode (Plugins);
+	// 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 &)
@@ -689,10 +725,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 &)
 {
@@ -701,12 +738,14 @@ MackieControlProtocol::dyn_release (Button &)
 LedState
 MackieControlProtocol::flip_press (Button &)
 {
-	if (_flip_mode != Normal) {
-		set_flip_mode (Normal);
-	} else {
-		set_flip_mode (Mirror);
+	if (subview_mode() == MackieControlProtocol::Sends) {
+		if (_flip_mode != Normal) {
+			set_flip_mode (Normal);
+		} else {
+			set_flip_mode (Mirror);
+		}
+		return ((_flip_mode != Normal) ? on : off);
 	}
-	return ((_flip_mode != Normal) ? on : off);
 }
 LedState
 MackieControlProtocol::flip_release (Button &)
@@ -726,22 +765,24 @@ MackieControlProtocol::name_value_release (Button &)
 LedState
 MackieControlProtocol::touch_press (Button &)
 {
-	return off;
+	return none;
 }
 LedState
 MackieControlProtocol::touch_release (Button &)
 {
-	return off;
+	set_automation_state (ARDOUR::Touch);
+	return none;
 }
 LedState
 MackieControlProtocol::cancel_press (Button &)
 {
-	return off;
+	access_action ("Transport/ToggleExternalSync");
+	return none;
 }
 LedState
 MackieControlProtocol::cancel_release (Button &)
 {
-	return off;
+	return none;
 }
 LedState
 MackieControlProtocol::user_a_press (Button &)
@@ -796,14 +837,14 @@ MackieControlProtocol::master_fader_touch_release (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&)
 {
-	return _metering_active;
+	set_automation_state (ARDOUR::Play);
+	return none;
 }
 Mackie::LedState
 MackieControlProtocol::write_press (Mackie::Button&)
@@ -813,22 +854,38 @@ MackieControlProtocol::write_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::write_release (Mackie::Button&)
 {
+	set_automation_state (ARDOUR::Write);
 	return none;
 }
+
 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&)
 {
+	//return session->soloing();
 	return none;
 }
+
 Mackie::LedState
 MackieControlProtocol::track_press (Mackie::Button&)
 {
-	set_pot_mode (Trim);
+	set_subview_mode (TrackView, first_selected_route());
 	return none;
 }
 Mackie::LedState
@@ -839,10 +896,9 @@ MackieControlProtocol::track_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::send_press (Mackie::Button&)
 {
-	return none;
-	// remove above line when sends implemented
-	set_pot_mode (Send);
-	return none;
+	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&)
@@ -857,11 +913,7 @@ MackieControlProtocol::miditracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::miditracks_release (Mackie::Button&)
 {
-	if (_view_mode == Mixer) {
-		_last_mix_bank = _current_initial_bank;
-	}
 	set_view_mode (MidiTracks);
-	switch_banks(0, true);
 	return none;
 }
 Mackie::LedState
@@ -882,22 +934,20 @@ MackieControlProtocol::audiotracks_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::audiotracks_release (Mackie::Button&)
 {
-	if (_view_mode == Mixer) {
-		_last_mix_bank = _current_initial_bank;
-	}
 	set_view_mode (AudioTracks);
-	switch_banks(0, true);
 	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&)
@@ -907,11 +957,7 @@ MackieControlProtocol::aux_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::aux_release (Mackie::Button&)
 {
-	if (_view_mode == Mixer) {
-		_last_mix_bank = _current_initial_bank;
-	}
 	set_view_mode (Auxes);
-	switch_banks(0, true);
 	return none;
 }
 Mackie::LedState
@@ -922,11 +968,7 @@ MackieControlProtocol::busses_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::busses_release (Mackie::Button&)
 {
-	if (_view_mode == Mixer) {
-		_last_mix_bank = _current_initial_bank;
-	}
 	set_view_mode (Busses);
-	switch_banks(0, true);
 	return none;
 }
 Mackie::LedState
@@ -937,6 +979,7 @@ MackieControlProtocol::outputs_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::outputs_release (Mackie::Button&)
 {
+	set_view_mode (Hidden);
 	return none;
 }
 Mackie::LedState
@@ -947,11 +990,7 @@ MackieControlProtocol::user_press (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::user_release (Mackie::Button&)
 {
-	if (_view_mode == Mixer) {
-		_last_mix_bank = _current_initial_bank;
-	}
 	set_view_mode (Selected);
-	switch_banks(0, true);
 	return none;
 }
 Mackie::LedState
@@ -982,22 +1021,41 @@ MackieControlProtocol::grp_press (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&)
 {
-	return none;
+	_modifier_state |= MODIFIER_NUDGE;
+	nudge_modifier_consumed_by_button = false;
+	return on;
 }
 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&)
 {
-	return none;
+	access_action ("Editor/finish-range-from-playhead");
+	return off;
 }
 Mackie::LedState
 MackieControlProtocol::replace_release (Mackie::Button&)
@@ -1018,7 +1076,6 @@ Mackie::LedState
 MackieControlProtocol::view_press (Mackie::Button&)
 {
 	set_view_mode (Mixer);
-	switch_banks (_last_mix_bank, true);
 	return none;
 }
 Mackie::LedState