X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvca.cc;h=e3476c5d082b16ed0916d72e5afe6518a6656d2d;hb=2b58bbd50aa6a4af4c8f3019820396e5081b041a;hp=2616549e1722b2880f16995670564b8cb6fcb7e2;hpb=c3afeab49c7f454f58bd1fb17b39ccac1d39258e;p=ardour.git diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc index 2616549e17..e3476c5d08 100644 --- a/libs/ardour/vca.cc +++ b/libs/ardour/vca.cc @@ -19,19 +19,22 @@ #include "pbd/convert.h" #include "ardour/automation_control.h" +#include "ardour/debug.h" #include "ardour/gain_control.h" +#include "ardour/monitor_control.h" #include "ardour/rc_configuration.h" #include "ardour/route.h" #include "ardour/session.h" #include "ardour/vca.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; using std::string; -gint VCA::next_number = 1; +Glib::Threads::Mutex VCA::number_lock; +int32_t VCA::next_number = 1; string VCA::xml_node_name (X_("VCA")); string @@ -40,42 +43,44 @@ VCA::default_name_template () return _("VCA %n"); } -int +int32_t VCA::next_vca_number () { - /* recall that atomic_int_add() returns the value before the add. We - * start at one, then next one will be two etc. - */ - return g_atomic_int_add (&next_number, 1); + /* we could use atomic inc here, but elsewhere we need more complete + mutex semantics, so we have to do it here also. + */ + Glib::Threads::Mutex::Lock lm (number_lock); + return next_number++; } void -VCA::set_next_vca_number (uint32_t n) +VCA::set_next_vca_number (int32_t n) { - g_atomic_int_set (&next_number, n); + Glib::Threads::Mutex::Lock lm (number_lock); + next_number = n; } -uint32_t +int32_t VCA::get_next_vca_number () { - return g_atomic_int_get (&next_number); + Glib::Threads::Mutex::Lock lm (number_lock); + return next_number; } -VCA::VCA (Session& s, uint32_t num, const string& name) - : Stripable (s, name) +VCA::VCA (Session& s, int32_t num, const string& name) + : Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA)) + , Muteable (s, name) , Automatable (s) , _number (num) , _gain_control (new GainControl (s, Evoral::Parameter (GainAutomation), boost::shared_ptr ())) - , _solo_requested (false) - , _mute_requested (false) { } int VCA::init () { - _solo_control.reset (new VCASoloControllable (X_("solo"), shared_from_this())); - _mute_control.reset (new VCAMuteControllable (X_("mute"), shared_from_this())); + _solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this)); + _mute_control.reset (new MuteControl (_session, X_("mute"), *this)); add_control (_gain_control); add_control (_solo_control); @@ -86,13 +91,23 @@ VCA::init () VCA::~VCA () { - DropReferences (); /* emit signal */ + DEBUG_TRACE (DEBUG::Destruction, string_compose ("delete VCA %1\n", number())); + { + Glib::Threads::Mutex::Lock lm (number_lock); + if (_number == next_number - 1) { + /* this was the "last" VCA added, so rewind the next number so + * that future VCAs get numbered as intended + */ + next_number--; + } + } } -uint32_t -VCA::remote_control_id () const +string +VCA::full_name() const { - return 9999999 + _number; + /* name() is never empty - default is VCA %n */ + return string_compose (_("VCA %1 : %2"), _number, name()); } XMLNode& @@ -101,12 +116,16 @@ VCA::get_state () XMLNode* node = new XMLNode (xml_node_name); node->add_property (X_("name"), _name); node->add_property (X_("number"), _number); - node->add_property (X_("soloed"), (_solo_requested ? X_("yes") : X_("no"))); - node->add_property (X_("muted"), (_mute_requested ? X_("yes") : X_("no"))); + + node->add_child_nocopy (_presentation_info.get_state()); node->add_child_nocopy (_gain_control->get_state()); + node->add_child_nocopy (_solo_control->get_state()); + node->add_child_nocopy (_mute_control->get_state()); node->add_child_nocopy (get_automation_xml_state()); + node->add_child_nocopy (Slavable::get_state()); + return *node; } @@ -115,6 +134,8 @@ VCA::set_state (XMLNode const& node, int version) { XMLProperty const* prop; + Stripable::set_state (node, version); + if ((prop = node.property ("name")) != 0) { set_name (prop->value()); } @@ -126,10 +147,24 @@ VCA::set_state (XMLNode const& node, int version) XMLNodeList const &children (node.children()); for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == Controllable::xml_node_name) { + XMLProperty* prop = (*i)->property ("name"); - if (prop && prop->value() == X_("gaincontrol")) { + + if (!prop) { + continue; + } + + if (prop->value() == _gain_control->name()) { _gain_control->set_state (**i, version); } + if (prop->value() == _solo_control->name()) { + _solo_control->set_state (**i, version); + } + if (prop->value() == _mute_control->name()) { + _mute_control->set_state (**i, version); + } + } else if ((*i)->name() == Slavable::xml_node_name) { + Slavable::set_state (**i, version); } } @@ -137,177 +172,36 @@ VCA::set_state (XMLNode const& node, int version) } void -VCA::add_solo_mute_target (boost::shared_ptr r) -{ - Glib::Threads::RWLock::WriterLock lm (solo_mute_lock); - solo_mute_targets.push_back (r); - r->DropReferences.connect_same_thread (solo_mute_connections, boost::bind (&VCA::solo_mute_target_going_away, this, boost::weak_ptr (r))); -} - -void -VCA::remove_solo_mute_target (boost::shared_ptr r) -{ - Glib::Threads::RWLock::WriterLock lm (solo_mute_lock); - solo_mute_targets.remove (r); -} - -void -VCA::solo_mute_target_going_away (boost::weak_ptr wr) -{ - boost::shared_ptr r (wr.lock()); - if (!r) { - return; - } - - Glib::Threads::RWLock::WriterLock lm (solo_mute_lock); - solo_mute_targets.remove (r); -} - -void -VCA::set_solo (bool yn) +VCA::clear_all_solo_state () { - { - Glib::Threads::RWLock::ReaderLock lm (solo_mute_lock); - - if (yn == _solo_requested) { - return; - } - - if (solo_mute_targets.empty()) { - return; - } - - boost::shared_ptr rl (new RouteList (solo_mute_targets)); - - if (Config->get_solo_control_is_listen_control()) { - _session.set_listen (rl, yn, Session::rt_cleanup, Controllable::NoGroup); - } else { - _session.set_solo (rl, yn, Session::rt_cleanup, Controllable::NoGroup); - } - } - - _solo_requested = yn; -} - -void -VCA::set_mute (bool yn) -{ - { - Glib::Threads::RWLock::ReaderLock lm (solo_mute_lock); - if (yn == _mute_requested) { - return; - } - - boost::shared_ptr rl (new RouteList (solo_mute_targets)); - _session.set_mute (rl, yn, Session::rt_cleanup, Controllable::NoGroup); - } - - _mute_requested = yn; + _solo_control->clear_all_solo_state (); } -bool -VCA::soloed () const +MonitorState +VCA::monitoring_state () const { - return _solo_requested; + /* XXX this has to get more complex but not clear how */ + return MonitoringInput; } bool -VCA::muted () const -{ - return _mute_requested; -} - -VCA::VCASoloControllable::VCASoloControllable (string const & name, boost::shared_ptr vca) - : AutomationControl (vca->session(), Evoral::Parameter (SoloAutomation), ParameterDescriptor (Evoral::Parameter (SoloAutomation)), - boost::shared_ptr(), name) - , _vca (vca) -{ -} - -void -VCA::VCASoloControllable::set_value (double val, PBD::Controllable::GroupControlDisposition gcd) -{ - if (writable()) { - _set_value (val, gcd); - } -} - -void -VCA::VCASoloControllable::_set_value (double val, PBD::Controllable::GroupControlDisposition gcd) -{ - boost::shared_ptr vca = _vca.lock(); - if (!vca) { - return; - } - - vca->set_solo (val >= 0.5); - - AutomationControl::set_value (val, gcd); -} - -void -VCA::VCASoloControllable::set_value_unchecked (double val) -{ - /* used only by automation playback */ - _set_value (val, Controllable::NoGroup); -} - -double -VCA::VCASoloControllable::get_value() const -{ - boost::shared_ptr vca = _vca.lock(); - if (!vca) { - return 0.0; - } - - return vca->soloed() ? 1.0 : 0.0; -} - -/*----*/ - -VCA::VCAMuteControllable::VCAMuteControllable (string const & name, boost::shared_ptr vca) - : AutomationControl (vca->session(), Evoral::Parameter (MuteAutomation), ParameterDescriptor (Evoral::Parameter (MuteAutomation)), - boost::shared_ptr(), name) - , _vca (vca) -{ -} - -void -VCA::VCAMuteControllable::set_value (double val, PBD::Controllable::GroupControlDisposition gcd) +VCA::slaved () const { - if (writable()) { - _set_value (val, gcd); + if (!_gain_control) { + return false; } + /* just test one particular control, not all of them */ + return _gain_control->slaved (); } -void -VCA::VCAMuteControllable::_set_value (double val, PBD::Controllable::GroupControlDisposition gcd) +bool +VCA::slaved_to (boost::shared_ptr vca) const { - boost::shared_ptr vca = _vca.lock(); - - if (!vca) { - return; + if (!vca || !_gain_control) { + return false; } - vca->set_mute (val >= 0.5); - - AutomationControl::set_value (val, gcd); -} - -void -VCA::VCAMuteControllable::set_value_unchecked (double val) -{ - /* used only by automation playback */ - _set_value (val, Controllable::NoGroup); -} - -double -VCA::VCAMuteControllable::get_value() const -{ - boost::shared_ptr vca = _vca.lock(); - if (!vca) { - return 0.0; - } + /* just test one particular control, not all of them */ - return vca->muted() ? 1.0 : 0.0; + return _gain_control->slaved_to (vca->gain_control()); }