smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Mackie Control: Fix Flip mode getting confused if subview is not sends.

Browse source
This commit is contained in:
Len Ovens 2016-02-02 09:38:55 -08:00
parent 7229dccb3b
commit 99a53ed7f0
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1708,6 +1708,10 @@ MackieControlProtocol::redisplay_subview_mode ()
int int
MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Route> r) MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Route> r)
{ {
if (_flip_mode != Normal) {
set_flip_mode (Normal);
}
boost::shared_ptr<Route> old_route = _subview_route; boost::shared_ptr<Route> old_route = _subview_route;
if (!subview_mode_would_be_ok (sm, r)) { if (!subview_mode_would_be_ok (sm, r)) {
@ -1823,6 +1827,9 @@ MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Route
void void
MackieControlProtocol::set_view_mode (ViewMode m) MackieControlProtocol::set_view_mode (ViewMode m)
{ {
if (_flip_mode != Normal) {
set_flip_mode (Normal);
}
ViewMode old_view_mode = _view_mode; ViewMode old_view_mode = _view_mode;
_view_mode = m; _view_mode = m;

2
libs/surfaces/mackie/mcp_buttons.cc
View file

@ -738,6 +738,7 @@ MackieControlProtocol::dyn_release (Button &)
LedState LedState
MackieControlProtocol::flip_press (Button &) MackieControlProtocol::flip_press (Button &)
{ {
if (subview_mode() == MackieControlProtocol::Sends) {
if (_flip_mode != Normal) { if (_flip_mode != Normal) {
set_flip_mode (Normal); set_flip_mode (Normal);
} else { } else {
@ -745,6 +746,7 @@ MackieControlProtocol::flip_press (Button &)
} }
return ((_flip_mode != Normal) ? on : off); return ((_flip_mode != Normal) ? on : off);
} }
}
LedState LedState
MackieControlProtocol::flip_release (Button &) MackieControlProtocol::flip_release (Button &)
{ {