summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-04-16 22:30:38 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-04-16 22:30:38 +0000
commitb5276aa4ab331feedec5c68db62bdfe12865fc49 (patch)
tree0f01173c42a6ebe3a1f054dc4a60401fea6d481d /libs
parente3d353715a712d8d23d299fd65c0461445d9ff0c (diff)
MCP: work on vpots
git-svn-id: svn://localhost/ardour2/branches/3.0@11992 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/surfaces/mackie/strip.cc22
1 files changed, 12 insertions, 10 deletions
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index f9c115bbe6..ec55124ed2 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -440,21 +440,23 @@ Strip::vselect_event (Button& button, ButtonState bs)
{
if (bs == press) {
- boost::shared_ptr<AutomationControl> ac = button.control ();
- if (ac) {
-
- int ms = _surface->mcp().modifier_state();
-
- if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
+ int ms = _surface->mcp().modifier_state();
+
+ if (ms & MackieControlProtocol::MODIFIER_SHIFT) {
+ boost::shared_ptr<AutomationControl> ac = button.control ();
+
+ if (ac) {
+
/* reset to default/normal value */
ac->set_value (ac->normal());
-
- } else {
- DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n");
- next_pot_mode ();
}
+
+ } else {
+ DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n");
+ next_pot_mode ();
}
+
}
}