From ce059e2d661e4cc46b7e9bfcf1d5caef618d487a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 21 Jun 2017 17:08:59 +0200 Subject: Remove internal_to_user/user_to_internal API Also GainControl can just use the AutomationControl's implementation of get_user_string() --- libs/ardour/ardour/gain_control.h | 9 -------- libs/ardour/ardour/monitor_processor.h | 3 --- libs/ardour/ardour/proxy_controllable.h | 3 --- libs/ardour/gain_control.cc | 41 --------------------------------- libs/pbd/pbd/controllable.h | 5 ---- 5 files changed, 61 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/gain_control.h b/libs/ardour/ardour/gain_control.h index 42465cc225..7fe5cc7bab 100644 --- a/libs/ardour/ardour/gain_control.h +++ b/libs/ardour/ardour/gain_control.h @@ -39,15 +39,6 @@ class LIBARDOUR_API GainControl : public SlavableAutomationControl { GainControl (Session& session, const Evoral::Parameter ¶m, boost::shared_ptr al = boost::shared_ptr()); - double internal_to_interface (double) const; - double interface_to_internal (double) const; - double internal_to_user (double) const; - double user_to_internal (double) const; - std::string get_user_string () const; - - double lower_db; - double range_db; - void inc_gain (gain_t); protected: diff --git a/libs/ardour/ardour/monitor_processor.h b/libs/ardour/ardour/monitor_processor.h index d369cb9c28..70f0761a49 100644 --- a/libs/ardour/ardour/monitor_processor.h +++ b/libs/ardour/ardour/monitor_processor.h @@ -66,9 +66,6 @@ public: return (float) _value; } - double internal_to_user (double i) const { return accurate_coefficient_to_dB (i);} - double user_to_internal (double u) const { return dB_to_coefficient(u) ;} - std::string get_user_string () const { char theBuf[32]; sprintf( theBuf, "%3.1f dB", accurate_coefficient_to_dB (get_value())); diff --git a/libs/ardour/ardour/proxy_controllable.h b/libs/ardour/ardour/proxy_controllable.h index 22761d7dba..e89cd17f0e 100644 --- a/libs/ardour/ardour/proxy_controllable.h +++ b/libs/ardour/ardour/proxy_controllable.h @@ -43,9 +43,6 @@ class LIBARDOUR_API ProxyControllable : public PBD::Controllable { void set_value (double v, PBD::Controllable::GroupControlDisposition gcd) { if (_setter (v)) { Changed (true, gcd); /* EMIT SIGNAL */ } } double get_value () const { return _getter (); } - double internal_to_user (double i) const { return accurate_coefficient_to_dB (i);} - double user_to_internal (double u) const { return dB_to_coefficient(u) ;} - std::string get_user_string () const { char theBuf[32]; sprintf( theBuf, "%3.1f dB", accurate_coefficient_to_dB (get_value())); return std::string(theBuf); diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc index 36a161059c..b734dedd01 100644 --- a/libs/ardour/gain_control.cc +++ b/libs/ardour/gain_control.cc @@ -40,47 +40,6 @@ GainControl::GainControl (Session& session, const Evoral::Parameter ¶m, boos param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol"), Controllable::GainLike) { - lower_db = accurate_coefficient_to_dB (_desc.lower); - range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db; -} - -double -GainControl::internal_to_interface (double v) const -{ - if (_desc.type == GainAutomation) { - return gain_to_slider_position_with_max (v, _desc.upper); - } else { - return (accurate_coefficient_to_dB (v) - lower_db) / range_db; - } -} - -double -GainControl::interface_to_internal (double v) const -{ - if (_desc.type == GainAutomation) { - return slider_position_to_gain_with_max (v, _desc.upper); - } else { - return dB_to_coefficient (lower_db + v * range_db); - } -} - -double -GainControl::internal_to_user (double v) const -{ - return accurate_coefficient_to_dB (v); -} - -double -GainControl::user_to_internal (double u) const -{ - return dB_to_coefficient (u); -} - -std::string -GainControl::get_user_string () const -{ - char theBuf[32]; sprintf( theBuf, _("%3.1f dB"), accurate_coefficient_to_dB (get_value())); - return std::string(theBuf); } void diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index a255bd6284..da50db3b3c 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -114,16 +114,11 @@ class LIBPBD_API Controllable : public PBD::StatefulDestructible { /** Conversions between `internal', 'interface', and 'user' values */ virtual double internal_to_interface (double i) const {return (i-lower())/(upper() - lower());} //by default, the interface range is just a linear interpolation between lower and upper values virtual double interface_to_internal (double i) const {return lower() + i*(upper() - lower());} - virtual double internal_to_user (double i) const {return i;} //by default the internal value is the same as the user value - virtual double user_to_internal (double i) const {return i;} //by default the internal value is the same as the user value /** Get and Set `interface' value (typically, fraction of knob travel) */ virtual float get_interface() const { return (internal_to_interface(get_value())); } virtual void set_interface (float fraction) { fraction = min( max(0.0f, fraction), 1.0f); set_value(interface_to_internal(fraction), NoGroup); } - /** Get and Set `user' value ( dB or milliseconds, etc. This MIGHT be the same as the internal value, but in a few cases it is not ) */ - virtual float get_user() const { return (internal_to_user(get_value())); } - virtual void set_user (float user_v) { set_value(user_to_internal(user_v), NoGroup); } virtual std::string get_user_string() const { return std::string(); } PBD::Signal0 LearningFinished; -- cgit v1.2.3