X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Fmcp_buttons.cc;h=6652516cf93ad4bba5906453c5088d93ba8a1e73;hb=4b70a0aa0d5e0c289755b9e3c8f99ed487454ef3;hp=60de07480e3cd130a133e782d892339d11a44f9e;hpb=e63c805fe2000b31207598c3c43b6bb6b383b0a5;p=ardour.git

diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 60de07480e..6652516cf9 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -108,9 +108,9 @@ MackieControlProtocol::left_press (Button &)
 	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);
 	}
 
 
@@ -120,7 +120,7 @@ MackieControlProtocol::left_press (Button &)
 LedState
 MackieControlProtocol::left_release (Button &)
 {
-	return off;
+	return none;
 }
 
 LedState
@@ -141,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
@@ -581,7 +574,7 @@ MackieControlProtocol::bank_release (Button& b, uint32_t basic_bank_num)
 		bank_num = 8 + basic_bank_num;
 	}
 
-	switch_banks (n_strips() * bank_num);
+	(void) switch_banks (n_strips() * bank_num);
 
 	return on;
 }
@@ -911,13 +904,13 @@ MackieControlProtocol::audiotracks_release (Mackie::Button&)
 Mackie::LedState
 MackieControlProtocol::audioinstruments_press (Mackie::Button& b)
 {
-	return dyn_press (b);
+	return none;
 }
 
 Mackie::LedState
 MackieControlProtocol::audioinstruments_release (Mackie::Button& b)
 {
-	return dyn_release (b);
+	return none;
 
 }
 Mackie::LedState