fix cherry-pick conflict

1 files changed, 27 insertions, 10 deletions

diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 85ea7c97b1..336855659b 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -1037,6 +1037,29 @@ Surface::update_potmode ()
 	}
 }
 
+bool
+Surface::update_subview_mode_display ()
+{
+	switch (_mcp.subview_mode()) {
+	case MackieControlProtocol::None:
+		for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
+			(*s)->use_subview (MackieControlProtocol::None, strips.front()->route());
+		}
+		/* normal display is required */
+		return false;
+	case MackieControlProtocol::EQ:
+		for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
+			(*s)->use_subview (MackieControlProtocol::EQ, strips.front()->route());
+		}
+		break;
+	case MackieControlProtocol::Dynamics:
+		break;
+	}
+
+	/* no normal display required */
+	return true;
+}
+
 void
 Surface::update_view_mode_display ()
 {
@@ -1047,6 +1070,10 @@ Surface::update_view_mode_display ()
 		return;
 	}
 
+	if (update_subview_mode_display ()) {
+		return;
+	}
+
 	switch (_mcp.view_mode()) {
 	case MackieControlProtocol::Mixer:
 		show_two_char_display ("Mx");
@@ -1087,16 +1114,6 @@ Surface::update_view_mode_display ()
 		id = Button::User;
 		text = _("Selected Routes");
 		break;
-	case MackieControlProtocol::Dynamics:
-		show_two_char_display ("DI");
-		id = Button::User;
-		text = _("Dynamics");
-		break;
-	case MackieControlProtocol::EQ:
-		show_two_char_display ("EQ");
-		id = Button::User;
-		text = _("EQ");
-		break;
 	default:
 		break;
 	}