X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fgain_control.cc;h=8910c9a98c6b4fafac48905d420e24f4febeec35;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=124ce97d45a68239e4359c563d23afe7314e00cc;hpb=562ec7df8fa25b78fc69880178c234cd5ee9d238;p=ardour.git diff --git a/libs/ardour/gain_control.cc b/libs/ardour/gain_control.cc index 124ce97d45..8910c9a98c 100644 --- a/libs/ardour/gain_control.cc +++ b/libs/ardour/gain_control.cc @@ -27,15 +27,15 @@ #include "ardour/vca.h" #include "ardour/vca_manager.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; GainControl::GainControl (Session& session, const Evoral::Parameter ¶m, boost::shared_ptr al) - : AutomationControl (session, param, ParameterDescriptor(param), - al ? al : boost::shared_ptr (new AutomationList (param)), - param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) { + : SlavableAutomationControl (session, param, ParameterDescriptor(param), + al ? al : boost::shared_ptr (new AutomationList (param)), + param.type() == GainAutomation ? X_("gaincontrol") : X_("trimcontrol")) { alist()->reset_default (1.0); @@ -43,58 +43,6 @@ GainControl::GainControl (Session& session, const Evoral::Parameter ¶m, boos range_db = accurate_coefficient_to_dB (_desc.upper) - lower_db; } -double -GainControl::get_value () const -{ - Glib::Threads::RWLock::ReaderLock lm (master_lock); - - if (_masters.empty()) { - return AutomationControl::get_value(); - } - - gain_t g = 1.0; - - for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - /* get current master value, scale by our current ratio with that master */ - g *= mr->master()->get_value () * mr->ratio(); - } - - return g; -} - -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); - } - } - - AutomationControl::set_value (val, group_override); - - _session.set_dirty (); -} - double GainControl::internal_to_interface (double v) const { @@ -134,109 +82,20 @@ GainControl::get_user_string () const return std::string(theBuf); } -gain_t -GainControl::get_master_gain () const -{ - Glib::Threads::RWLock::ReaderLock sm (master_lock, Glib::Threads::TRY_LOCK); - - if (sm.locked()) { - return get_master_gain_locked (); - } - - return 1.0; -} - -gain_t -GainControl::get_master_gain_locked () const -{ - /* Master lock MUST be held (read or write lock is acceptable) */ - - gain_t g = 1.0; - - for (Masters::const_iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - /* get current master value, scale by our current ratio with that master */ - g *= mr->master()->get_value () * mr->ratio(); - } - - return g; -} - void -GainControl::add_master (boost::shared_ptr vca) +GainControl::inc_gain (gain_t factor) { - gain_t old_master_val; - std::pair res; - - { - Glib::Threads::RWLock::WriterLock lm (master_lock); - old_master_val = get_master_gain_locked (); - - /* ratio will be recomputed below */ - - MasterRecord mr (vca->control(), vca->number(), 0.0); - - res = _masters.insert (mr); - recompute_masters_ratios (old_master_val); - - /* note that we bind @param m as a weak_ptr, thus - avoiding holding a reference to the control in the binding - itself. - */ - - vca->DropReferences.connect_same_thread (masters_connections, boost::bind (&GainControl::master_going_away, this, vca)); - vca->control()->Changed.connect_same_thread (masters_connections, boost::bind (&PBD::Signal0::operator(), &Changed)); - } - - if (res.second) { - VCAStatusChange (); /* EMIT SIGNAL */ - } -} - -void -GainControl::master_going_away (boost::weak_ptr wv) -{ - boost::shared_ptr v = wv.lock(); - if (v) { - remove_master (v); - } -} - -void -GainControl::remove_master (boost::shared_ptr vca) -{ - gain_t old_master_val; - Masters::size_type erased = 0; - - { - Glib::Threads::RWLock::WriterLock lm (master_lock); - old_master_val = get_master_gain_locked (); - MasterRecord mr (vca->control(), vca->number(), 0.0); - erased = _masters.erase (mr); - if (erased) { - recompute_masters_ratios (old_master_val); - } - } - - if (erased) { - VCAStatusChange (); /* EMIT SIGNAL */ - } -} - -void -GainControl::clear_masters () -{ - bool had_masters = false; + /* To be used ONLY when doing group-relative gain adjustment, from + * ControlGroup::set_group_values(). + */ - { - Glib::Threads::RWLock::WriterLock lm (master_lock); - if (!_masters.empty()) { - had_masters = true; - } - _masters.clear (); - } + const float desired_gain = user_double(); - if (had_masters) { - VCAStatusChange (); /* EMIT SIGNAL */ + 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); } } @@ -278,35 +137,22 @@ GainControl::recompute_masters_ratios (double val) double masters_total_gain_coefficient = 1.0; for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { - masters_total_gain_coefficient *= mr->master()->get_value(); + 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) { - const_cast(&(*mr))->reset_ratio (new_universal_ratio); + mr->second.reset_ratio (new_universal_ratio); } } -bool -GainControl::slaved_to (boost::shared_ptr vca) const -{ - Glib::Threads::RWLock::ReaderLock lm (master_lock); - return find (_masters.begin(), _masters.end(), MasterRecord (vca->control(), vca->number(), 0.0)) != _masters.end(); -} - -bool -GainControl::slaved () const -{ - Glib::Threads::RWLock::ReaderLock lm (master_lock); - return !_masters.empty(); -} - XMLNode& GainControl::get_state () { XMLNode& node (AutomationControl::get_state()); +#if 0 /* store VCA master IDs */ string str; @@ -317,13 +163,14 @@ GainControl::get_state () if (!str.empty()) { str += ','; } - str += PBD::to_string (mr->number(), std::dec); + str += PBD::to_string (mr->first, std::dec); } } if (!str.empty()) { node.add_property (X_("masters"), str); } +#endif return node; } @@ -331,26 +178,6 @@ GainControl::get_state () int GainControl::set_state (XMLNode const& node, int version) { - AutomationControl::set_state (node, version); - - XMLProperty const* prop = node.property (X_("masters")); - - /* XXX Problem here if we allow VCA's to be slaved to other VCA's .. we - * have to load all VCAs first, then call ::set_state() so that - * vca_by_number() will succeed. - */ - - if (prop) { - vector masters; - split (prop->value(), masters, ','); - - for (vector::const_iterator m = masters.begin(); m != masters.end(); ++m) { - boost::shared_ptr vca = _session.vca_manager().vca_by_number (PBD::atoi (*m)); - if (vca) { - add_master (vca); - } - } - } - - return 0; + return AutomationControl::set_state (node, version); } +