smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 15:15:41 +01:00
Code Issues Projects Releases Wiki Activity

Remove internal_to_user/user_to_internal API

Browse source 
Also GainControl can just use the AutomationControl's implementation of
get_user_string()
This commit is contained in:
Robin Gareus 2017-06-21 17:08:59 +02:00
parent 55df5b39bc
commit ce059e2d66
5 changed files with 0 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/ardour/gain_control.h
View file

@ -39,15 +39,6 @@ class LIBARDOUR_API GainControl : public SlavableAutomationControl {
GainControl (Session& session, const Evoral::Parameter &param,
boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>());
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:

3
libs/ardour/ardour/monitor_processor.h
View file

@ -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()));

3
libs/ardour/ardour/proxy_controllable.h
View file

@ -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);

41
libs/ardour/gain_control.cc
View file

@ -40,47 +40,6 @@ GainControl::GainControl (Session& session, const Evoral::Parameter &param, 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

5
libs/pbd/pbd/controllable.h
View file

@ -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<void> LearningFinished;