summaryrefslogtreecommitdiff
path: root/libs/surfaces
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-05-04 09:22:41 +0000
committerCarl Hetherington <carl@carlh.net>2011-05-04 09:22:41 +0000
commit56b70dcc0b64d34d346514ecfb7c528b140cb743 (patch)
treeaabf942fd9b7967c6e9d929b8d944a774daf437c /libs/surfaces
parent91d512174efb610b004bd4542e05f99080a668d5 (diff)
Do log/lin mapping for Mackie faders so that they behave like the on-screen ones.
git-svn-id: svn://localhost/ardour2/branches/3.0@9470 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
-rw-r--r--libs/surfaces/mackie/mackie_control_protocol.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 0165b74337..15a091d66d 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -808,7 +808,7 @@ MackieControlProtocol::handle_control_event (SurfacePort & port, Control & contr
// at which point the fader should just reset itself
if (route != 0)
{
- route->gain_control()->set_value (state.pos);
+ route->gain_control()->set_value (slider_position_to_gain (state.pos));
if (ARDOUR::Config->get_mackie_emulation() == "bcf") {
/* reset the timeout while we're still moving the fader */
@@ -953,7 +953,7 @@ MackieControlProtocol::notify_gain_changed (RouteSignal * route_signal, bool for
Fader & fader = route_signal->strip().gain();
if (!fader.in_use())
{
- float gain_value = route_signal->route()->gain_control()->get_value();
+ float gain_value = gain_to_slider_position (route_signal->route()->gain_control()->get_value());
// check that something has actually changed
if (force_update || gain_value != route_signal->last_gain_written())
{