extensive changes to PresentationInfo API

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

diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc
index 456fd9b248d4e0bbea8553d7e3a5a357871e63df..ef560085cc960137d0e997e76dfdab9b59856d55 100644 (file)
--- a/libs/ardour/gain_control.cc
+++ b/libs/ardour/gain_control.cc
@@ -33,9 +33,9 @@ using namespace ARDOUR;
 using namespace std;
 
 GainControl::GainControl (Session& session, const Evoral::Parameter &param, boost::shared_ptr<AutomationList> al)
-       : AutomationControl (session, param, ParameterDescriptor(param),
-                            al ? al : boost::shared_ptr<AutomationList> (new AutomationList (param)),
-                            param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) {
+       : SlavableAutomationControl (session, param, ParameterDescriptor(param),
+                                    al ? al : boost::shared_ptr<AutomationList> (new AutomationList (param)),
+                                    param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) {
 
        alist()->reset_default (1.0);
 
@@ -43,43 +43,6 @@ GainControl::GainControl (Session& session, const Evoral::Parameter &param, boos
        range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db;
 }
 
-void
-GainControl::set_value (double val, PBD::Controllable::GroupControlDisposition group_override)
-{
-       if (writable()) {
-               _set_value (val, group_override);
-       }
-}
-
-void
-GainControl::set_value_unchecked (double val)
-{
-       /* used only automation playback */
-       _set_value (val, Controllable::NoGroup);
-}
-
-void
-GainControl::_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::set_value (val, group_override);
-
-       _session.set_dirty ();
-}
-
 double
 GainControl::internal_to_interface (double v) const
 {
@@ -119,6 +82,23 @@ GainControl::get_user_string () const
        return std::string(theBuf);
 }
 
+void
+GainControl::inc_gain (gain_t factor)
+{
+       /* To be used ONLY when doing group-relative gain adjustment, from
+        * ControlGroup::set_group_values().
+        */
+
+       const float desired_gain = user_double();
+
+       if (fabsf (desired_gain) < GAIN_COEFF_SMALL) {
+               // really?! what's the idea here?
+               actually_set_value (0.000001f + (0.000001f * factor), Controllable::ForGroup);
+       } else {
+               actually_set_value (desired_gain + (desired_gain * factor), Controllable::ForGroup);
+       }
+}
+
 void
 GainControl::recompute_masters_ratios (double val)
 {
@@ -198,47 +178,6 @@ GainControl::get_state ()
 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;
+       return AutomationControl::set_state (node, version);
 }
 
-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 ();
-}