diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-16 11:05:40 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-12-16 11:05:40 -0500 |
| commit | bff1fcbe4813346b72e8afcc1e7ea4d3c3f598bd (patch) | |
| tree | a2b9566bd6a72315767719a6a94a9080d4f2e22e | |
| parent | cfff528ae9036252b8f30c9cb4566c5971c95f10 (diff) | |
mackie: restore access to trim and pan width control
Change from Evoral::Parameter to AutomationType caused this glitch
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index 15ff9e1a38..d3b366539d 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -1410,13 +1410,16 @@ Strip::next_pot_mode () if (!ac) { return; } + + if (_surface->mcp().pot_mode() == MackieControlProtocol::Pan) { - if (possible_pot_parameters.empty() || (possible_pot_parameters.size() == 1 && possible_pot_parameters.front() == ac->parameter())) { + + if (possible_pot_parameters.empty() || (possible_pot_parameters.size() == 1 && possible_pot_parameters.front() == ac->parameter().type())) { return; } for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) { - if ((*i) == ac->parameter()) { + if ((*i) == ac->parameter().type()) { break; } } @@ -1432,14 +1435,15 @@ Strip::next_pot_mode () if (i == possible_pot_parameters.end()) { i = possible_pot_parameters.begin(); } + set_vpot_parameter (*i); } else if (_surface->mcp().pot_mode() == MackieControlProtocol::Trim) { - if (possible_trim_parameters.empty() || (possible_trim_parameters.size() == 1 && possible_trim_parameters.front() == ac->parameter())) { + if (possible_trim_parameters.empty() || (possible_trim_parameters.size() == 1 && possible_trim_parameters.front() == ac->parameter().type())) { return; } for (i = possible_trim_parameters.begin(); i != possible_trim_parameters.end(); ++i) { - if ((*i) == ac->parameter()) { + if ((*i) == ac->parameter().type()) { break; } } |