ardour/livetrax
13
0
Fork 0
Code

MCP: probably fix crash from flip mode, and debug modifier state in pothandler

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11932 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-12 01:05:18 +00:00
parent 5b34da2f96
commit dd81c77161
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/surfaces/mackie/strip.cc
View File

@ -473,6 +473,7 @@ Strip::handle_pot (Pot& pot, float delta)
case MackieControlProtocol::Normal: /* pot controls pan */
case MackieControlProtocol::Mirror: /* pot + fader control pan */
case MackieControlProtocol::Zero: /* pot controls pan, faders don't move */
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("modifier state %1\n", _surface->mcp().modifier_state()));
if (_surface->mcp().modifier_state() & MackieControlProtocol::MODIFIER_CONTROL) {
DEBUG_TRACE (DEBUG::MackieControl, "pot using control to alter width\n");
ac = pannable->pan_width_control;
@ -486,14 +487,16 @@ Strip::handle_pot (Pot& pot, float delta)
break;
}
double p = ac->get_value();
// calculate new value, and adjust
p += delta;
p = min (1.0, p);
p = max (0.0, p);
ac->set_value (p);
if (ac) {
double p = ac->get_value();
// calculate new value, and adjust
p += delta;
p = min (1.0, p);
p = max (0.0, p);
ac->set_value (p);
}
}
}