Merge branch 'ovenwerks-master'

1 files changed, 5 insertions, 282 deletions

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 1cb388da48..269d964423 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -343,19 +343,6 @@ MackieControlProtocol::undo_release (Button&)
 	return off;
 }
 
-LedState
-MackieControlProtocol::redo_press (Button&)
-{
-	Redo(); /* EMIT SIGNAL */
-	return off;
-}
-
-LedState
-MackieControlProtocol::redo_release (Button&)
-{
-	return off;
-}
-
 LedState 
 MackieControlProtocol::drop_press (Button &)
 {
@@ -432,59 +419,6 @@ MackieControlProtocol::marker_release (Button &)
 /////////////////////////////////////
 
 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;
-		}
-	}
-
-	// 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());
-	}
-
-	return on;
-}
-
-LedState 
-MackieControlProtocol::frm_left_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;
-}
-
-LedState 
 MackieControlProtocol::stop_press (Button &)
 {
 	transport_stop ();
@@ -580,60 +514,6 @@ MackieControlProtocol::loop_release (Button &)
 }
 
 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 &)
-{
-	bool const state = !session->config.get_punch_out();
-	session->config.set_punch_out (state);
-	return state;
-}
-
-LedState 
-MackieControlProtocol::punch_out_release (Button &)
-{
-	return session->config.get_punch_out();
-}
-
-LedState 
-MackieControlProtocol::home_press (Button &)
-{
-	session->goto_start();
-	return on;
-}
-
-LedState 
-MackieControlProtocol::home_release (Button &)
-{
-	return off;
-}
-
-LedState 
-MackieControlProtocol::end_press (Button &)
-{
-	session->goto_end();
-	return on;
-}
-
-LedState 
-MackieControlProtocol::end_release (Button &)
-{
-	return off;
-}
-
-LedState 
 MackieControlProtocol::clicking_press (Button &)
 {
 	bool state = !Config->get_clicking();
@@ -757,27 +637,6 @@ MackieControlProtocol::F8_release (Button &)
 /* 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; 
@@ -835,16 +694,6 @@ 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; 
@@ -855,106 +704,6 @@ 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; 
@@ -975,16 +724,6 @@ MackieControlProtocol::cancel_release (Button &)
 	return off; 
 }
 LedState
-MackieControlProtocol::mixer_press (Button &) 
-{ 
-	return off; 
-}
-LedState
-MackieControlProtocol::mixer_release (Button &) 
-{ 
-	return off; 
-}
-LedState
 MackieControlProtocol::user_a_press (Button &) 
 { 
 	transport_play (session->transport_speed() == 1.0);
@@ -1035,16 +774,6 @@ MackieControlProtocol::master_fader_touch_release (Mackie::Button &)
 }
 
 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&) 
 {
 	_metering_active = !_metering_active;
@@ -1067,16 +796,6 @@ MackieControlProtocol::write_release (Mackie::Button&)
 	return none;
 }
 Mackie::LedState 
-MackieControlProtocol::fdrgroup_press (Mackie::Button&) 
-{
-	return none;
-}
-Mackie::LedState 
-MackieControlProtocol::fdrgroup_release (Mackie::Button&) 
-{
-	return none;
-}
-Mackie::LedState 
 MackieControlProtocol::clearsolo_press (Mackie::Button&) 
 {
 	return none;
@@ -1089,6 +808,7 @@ MackieControlProtocol::clearsolo_release (Mackie::Button&)
 Mackie::LedState 
 MackieControlProtocol::track_press (Mackie::Button&) 
 {
+
 	return none;
 }
 Mackie::LedState 
@@ -1099,7 +819,10 @@ MackieControlProtocol::track_release (Mackie::Button&)
 Mackie::LedState 
 MackieControlProtocol::send_press (Mackie::Button&) 
 {
-	return none;
+// code moved here from "sends_press"
+	set_view_mode (Sends);
+	return on;
+//	return none;
 }
 Mackie::LedState 
 MackieControlProtocol::send_release (Mackie::Button&)