From 5461b50cdb7a488ff7e5f38482067fecdd9129e0 Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Sat, 17 Oct 2015 16:23:46 -0700 Subject: [PATCH] Assign Global view to get back to Mixer. --- libs/surfaces/mackie/mcp_buttons.cc | 1 + libs/surfaces/mackie/surface.cc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc index a2bcdf7f4c..0fc11d507e 100644 --- a/libs/surfaces/mackie/mcp_buttons.cc +++ b/libs/surfaces/mackie/mcp_buttons.cc @@ -996,6 +996,7 @@ MackieControlProtocol::click_release (Mackie::Button&) Mackie::LedState MackieControlProtocol::view_press (Mackie::Button&) { + set_view_mode (Mixer); return none; } Mackie::LedState diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 9dc0421baf..654cd60ac4 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -1034,7 +1034,7 @@ Surface::update_view_mode_display () switch (_mcp.view_mode()) { case MackieControlProtocol::Mixer: show_two_char_display ("Mx"); - id = Button::Track; + id = Button::View; text = _("Mixer View"); break; case MackieControlProtocol::AudioTracks: @@ -1067,7 +1067,7 @@ Surface::update_view_mode_display () } vector view_mode_buttons; - view_mode_buttons.push_back (Button::Track); + view_mode_buttons.push_back (Button::View); view_mode_buttons.push_back (Button::Busses); view_mode_buttons.push_back (Button::Plugin); view_mode_buttons.push_back (Button::AudioTracks);