ardour/livetrax
13
0
Fork 0
Code

MCP: next try at vpot mode for pan width

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12013 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-18 17:34:31 +00:00
parent e9dcd14bb4
commit c7c9c1bd26
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/mackie/pot.cc
View File

@ -74,7 +74,11 @@ Pot::update_message ()
// position, but only if off hasn't explicitly been set // position, but only if off hasn't explicitly been set
if (on) { if (on) {
msg += (lrintf (position * 10.0) + 1) & 0x0f; // 0b00001111 if (mode == spread) {
msg += (lrintf (position * 6) + 1) & 0x0f; // 0b00001111
} else {
msg += (lrintf (position * 10.0) + 1) & 0x0f; // 0b00001111
}
} }
/* outbound LED message requires 0x20 to be added to the LED's id /* outbound LED message requires 0x20 to be added to the LED's id

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

@ -447,7 +447,7 @@ Strip::notify_panner_width_changed (bool force_update)
_surface->write (_fader->set_position (pos)); _surface->write (_fader->set_position (pos));
do_parameter_display (PanWidthAutomation, pos); do_parameter_display (PanWidthAutomation, pos);
} else { } else {
_surface->write (_vpot->set_all (pos, true, Pot::dot)); _surface->write (_vpot->set_all (pos, true, Pot::spread));
do_parameter_display (PanWidthAutomation, pos); do_parameter_display (PanWidthAutomation, pos);
} }
@ -853,6 +853,14 @@ Strip::flip_mode_changed (bool notify)
return; return;
} }
if (_surface->mcp().flip_mode()) {
/* flip mode is on - save what it used to be */
_preflip_vpot_mode = _vpot_mode;
} else {
/* flip mode is off - restore flip mode to what it used to be */
_vpot_mode = _preflip_vpot_mode;
}
boost::shared_ptr<AutomationControl> fader_controllable = _fader->control (); boost::shared_ptr<AutomationControl> fader_controllable = _fader->control ();
boost::shared_ptr<AutomationControl> vpot_controllable = _vpot->control (); boost::shared_ptr<AutomationControl> vpot_controllable = _vpot->control ();
@ -1067,7 +1075,7 @@ Strip::set_vpot_mode (PotMode m)
/* gain to fader, pan width to vpot */ /* gain to fader, pan width to vpot */
_fader->set_control (_route->gain_control()); _fader->set_control (_route->gain_control());
if (pannable) { if (pannable) {
_vpot->set_mode (Pot::dot); _vpot->set_mode (Pot::spread);
_vpot->set_control (pannable->pan_width_control); _vpot->set_control (pannable->pan_width_control);
} }
} }