diff options
| author | John Anderson <ardour@semiosix.com> | 2007-08-12 19:18:19 +0000 |
|---|---|---|
| committer | John Anderson <ardour@semiosix.com> | 2007-08-12 19:18:19 +0000 |
| commit | c25496008816325bf85ac5f777978f7ce351fb1e (patch) | |
| tree | b57c15e8f038fc81f8cdf8be8e30651934f5f8fd /libs/surfaces | |
| parent | f8b06e1f8d37dc8ae1f35e9388ccb8b40a6eec5f (diff) | |
remove duplicated gain_to_slider functions
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2291 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index f87b6b10ed..afde7a55ae 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -69,27 +69,6 @@ using boost::shared_ptr; MackieMidiBuilder builder; -// Copied from tranzport_control_protocol.cc -static inline double -gain_to_slider_position (ARDOUR::gain_t g) -{ - if (g == 0) return 0; - return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0); -} - -/* - Copied from tranzport_control_protocol.cc - TODO this seems to return slightly wrong values, namely - with the UI slider at max, we get a 0.99something value. -*/ -static inline ARDOUR::gain_t -slider_position_to_gain (double pos) -{ - /* XXX Marcus writes: this doesn't seem right to me. but i don't have a better answer ... */ - if (pos == 0.0) return 0; - return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0); -} - MackieControlProtocol::MackieControlProtocol (Session& session) : ControlProtocol (session, X_("Mackie")) , _current_initial_bank( 0 ) @@ -841,7 +820,7 @@ void MackieControlProtocol::handle_control_event( SurfacePort & port, Control & // at which point the fader should just reset itself if ( route != 0 ) { - route->set_gain( slider_position_to_gain( state.pos ), this ); + route->gain_control().set_value( state.pos ); // must echo bytes back to slider now, because // the notifier only works if the fader is not being @@ -992,7 +971,7 @@ void MackieControlProtocol::notify_gain_changed( RouteSignal * route_signal ) #endif if ( !fader.in_use() ) { - route_signal->port().write( builder.build_fader( fader, gain_to_slider_position( route_signal->route().effective_gain() ) ) ); + route_signal->port().write( builder.build_fader( fader, route_signal->route().gain_control().get_value() ) ); } } catch( exception & e ) |