Fix copy/paste typo -- MacOSX builds

[ardour.git] / libs / ardour / gain_control.cc

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index 508ddd12a6ca100eb2c587997bfbac51866e3919..e6154495a4a40cba3c5a88b7484d12547ebcbfb0 100644 (file)
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -27,7 +27,7 @@
 #include "ardour/vca.h"
 #include "ardour/vca_manager.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -35,36 +35,15 @@ using namespace std;
 GainControl::GainControl (Session& session, const Evoral::Parameter &param, boost::shared_ptr<AutomationList> al)
        : SlavableAutomationControl (session, param, ParameterDescriptor(param),
                                     al ? al : boost::shared_ptr<AutomationList> (new AutomationList (param)),
-                                    param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) {
-
+                                    param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol"),
+                                    Controllable::GainLike)
+{
        alist()->reset_default (1.0);
 
        lower_db = accurate_coefficient_to_dB (_desc.lower);
        range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db;
 }
 
-void
-GainControl::actually_set_value (double val, Controllable::GroupControlDisposition group_override)
-{
-       val = std::max (std::min (val, (double)_desc.upper), (double)_desc.lower);
-
-       {
-               Glib::Threads::RWLock::WriterLock lm (master_lock);
-
-               if (!_masters.empty()) {
-                       recompute_masters_ratios (val);
-               }
-       }
-
-       /* this sets the Evoral::Control::_user_value for us, which will
-          be retrieved by AutomationControl::get_value ()
-       */
-
-       AutomationControl::actually_set_value (val, group_override);
-
-       _session.set_dirty ();
-}
-
 double
 GainControl::internal_to_interface (double v) const
 {
@@ -121,127 +100,3 @@ GainControl::inc_gain (gain_t factor)
        }
 }
 
-void
-GainControl::recompute_masters_ratios (double val)
-{
-       /* Master WRITE lock must be held */
-
-       /* V' is the new gain value for this
-
-          Mv(n) is the return value of ::get_value() for the n-th master
-          Mr(n) is the return value of ::ratio() for the n-th master record
-
-          the slave should return V' on the next call to ::get_value().
-
-          but the value is determined by the masters, so we know:
-
-          V' = (Mv(1) * Mr(1)) * (Mv(2) * Mr(2)) * ... * (Mv(n) * Mr(n))
-
-          hence:
-
-          Mr(1) * Mr(2) * ... * (Mr(n) = V' / (Mv(1) * Mv(2) * ... * Mv(n))
-
-          if we make all ratios equal (i.e. each master contributes the same
-          fraction of its own gain level to make the final slave gain), then we
-          have:
-
-          pow (Mr(n), n) = V' / (Mv(1) * Mv(2) * ... * Mv(n))
-
-          which gives
-
-          Mr(n) = pow ((V' / (Mv(1) * Mv(2) * ... * Mv(n))), 1/n)
-
-          Mr(n) is the new ratio number for the slaves
-       */
-
-
-       const double nmasters = _masters.size();
-       double masters_total_gain_coefficient = 1.0;
-
-       for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-               masters_total_gain_coefficient *= mr->second.master()->get_value();
-       }
-
-       const double new_universal_ratio = pow ((val / masters_total_gain_coefficient), (1.0/nmasters));
-
-       for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-               mr->second.reset_ratio (new_universal_ratio);
-       }
-}
-
-XMLNode&
-GainControl::get_state ()
-{
-       XMLNode& node (AutomationControl::get_state());
-
-#if 0
-       /* store VCA master IDs */
-
-       string str;
-
-       {
-               Glib::Threads::RWLock::ReaderLock lm (master_lock);
-               for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
-                       if (!str.empty()) {
-                               str += ',';
-                       }
-                       str += PBD::to_string (mr->first, std::dec);
-               }
-       }
-
-       if (!str.empty()) {
-               node.add_property (X_("masters"), str);
-       }
-#endif
-
-       return node;
-}
-
-int
-GainControl::set_state (XMLNode const& node, int version)
-{
-       AutomationControl::set_state (node, version);
-
-#if 0
-       XMLProperty const* prop = node.property (X_("masters"));
-
-       /* Problem here if we allow VCA's to be slaved to other VCA's .. we
-        * have to load all VCAs first, then set up slave/master relationships
-        * once we have them all.
-        */
-
-       if (prop) {
-               masters_string = prop->value ();
-
-               if (_session.vca_manager().vcas_loaded()) {
-                       vcas_loaded ();
-               } else {
-                       _session.vca_manager().VCAsLoaded.connect_same_thread (vca_loaded_connection, boost::bind (&GainControl::vcas_loaded, this));
-               }
-       }
-#endif
-
-       return 0;
-}
-
-void
-GainControl::vcas_loaded ()
-{
-       if (masters_string.empty()) {
-               return;
-       }
-
-       vector<string> masters;
-       split (masters_string, masters, ',');
-
-       for (vector<string>::const_iterator m = masters.begin(); m != masters.end(); ++m) {
-               boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (PBD::atoi (*m));
-               if (vca) {
-                       add_master (vca->gain_control());
-               }
-       }
-
-       vca_loaded_connection.disconnect ();
-       masters_string.clear ();
-}
-