allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 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
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;
if (!subview_mode_would_be_ok (sm, r)) {
@@ -1823,6 +1827,9 @@ MackieControlProtocol::set_subview_mode (SubViewMode sm, boost::shared_ptr<Route
void
MackieControlProtocol::set_view_mode (ViewMode m)
{
if (_flip_mode != Normal) {
set_flip_mode (Normal);
}
ViewMode old_view_mode = _view_mode;
_view_mode = m;

12
libs/surfaces/mackie/mcp_buttons.cc
View File

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