MCP: probably fix crash from flip mode, and debug modifier state in pothandler
git-svn-id: svn://localhost/ardour2/branches/3.0@11932 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
5b34da2f96
commit
dd81c77161
@ -473,6 +473,7 @@ Strip::handle_pot (Pot& pot, float delta)
|
|||||||
case MackieControlProtocol::Normal: /* pot controls pan */
|
case MackieControlProtocol::Normal: /* pot controls pan */
|
||||||
case MackieControlProtocol::Mirror: /* pot + fader control pan */
|
case MackieControlProtocol::Mirror: /* pot + fader control pan */
|
||||||
case MackieControlProtocol::Zero: /* pot controls pan, faders don't move */
|
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) {
|
if (_surface->mcp().modifier_state() & MackieControlProtocol::MODIFIER_CONTROL) {
|
||||||
DEBUG_TRACE (DEBUG::MackieControl, "pot using control to alter width\n");
|
DEBUG_TRACE (DEBUG::MackieControl, "pot using control to alter width\n");
|
||||||
ac = pannable->pan_width_control;
|
ac = pannable->pan_width_control;
|
||||||
@ -486,6 +487,7 @@ Strip::handle_pot (Pot& pot, float delta)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ac) {
|
||||||
double p = ac->get_value();
|
double p = ac->get_value();
|
||||||
|
|
||||||
// calculate new value, and adjust
|
// calculate new value, and adjust
|
||||||
@ -495,6 +497,7 @@ Strip::handle_pot (Pot& pot, float delta)
|
|||||||
|
|
||||||
ac->set_value (p);
|
ac->set_value (p);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
Reference in New Issue
Block a user