smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

mackie: restore access to trim and pan width control

Browse source 
Change from Evoral::Parameter to AutomationType caused this glitch
This commit is contained in:
Paul Davis 2015-12-16 11:05:40 -05:00
parent cfff528ae9
commit bff1fcbe48
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/surfaces/mackie/strip.cc
View file

@ -1410,13 +1410,16 @@ Strip::next_pot_mode ()
if (!ac) { if (!ac) {
return; return;
} }
if (_surface->mcp().pot_mode() == MackieControlProtocol::Pan) { 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; return;
} }
for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) { for (i = possible_pot_parameters.begin(); i != possible_pot_parameters.end(); ++i) {
if ((*i) == ac->parameter()) { if ((*i) == ac->parameter().type()) {
break; break;
} }
} }
@ -1432,14 +1435,15 @@ Strip::next_pot_mode ()
if (i == possible_pot_parameters.end()) { if (i == possible_pot_parameters.end()) {
i = possible_pot_parameters.begin(); i = possible_pot_parameters.begin();
} }
set_vpot_parameter (*i); set_vpot_parameter (*i);
} else if (_surface->mcp().pot_mode() == MackieControlProtocol::Trim) { } 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; return;
} }
for (i = possible_trim_parameters.begin(); i != possible_trim_parameters.end(); ++i) { for (i = possible_trim_parameters.begin(); i != possible_trim_parameters.end(); ++i) {
if ((*i) == ac->parameter()) { if ((*i) == ac->parameter().type()) {
break; break;
} }
} }