From 9a0f4b1ef354f5ccc7cbe49a28b4a5eb35e0eb99 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 8 Mar 2016 09:22:22 -0500 Subject: move vca assignment up to the Route level (from GainControl) --- libs/ardour/ardour/vca.h | 21 ++++++++++++------ libs/ardour/route.cc | 6 ++++-- libs/ardour/vca.cc | 55 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 069eb98564..82e0e7acd2 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -46,8 +46,10 @@ class LIBARDOUR_API VCA : public Stripable, public Automatable, public boost::en XMLNode& get_state(); int set_state (XMLNode const&, int version); - void add_solo_mute_target (boost::shared_ptr); - void remove_solo_mute_target (boost::shared_ptr); + void add_solo_target (boost::shared_ptr); + void remove_solo_target (boost::shared_ptr); + void add_mute_target (boost::shared_ptr); + void remove_mute_target (boost::shared_ptr); bool soloed () const; bool muted () const; @@ -125,9 +127,15 @@ class LIBARDOUR_API VCA : public Stripable, public Automatable, public boost::en friend class VCAMuteControllable; uint32_t _number; - RouteList solo_mute_targets; - PBD::ScopedConnectionList solo_mute_connections; - mutable Glib::Threads::RWLock solo_mute_lock; + + RouteList solo_targets; + PBD::ScopedConnectionList solo_connections; + mutable Glib::Threads::RWLock solo_lock; + + RouteList mute_targets; + PBD::ScopedConnectionList mute_connections; + mutable Glib::Threads::RWLock mute_lock; + boost::shared_ptr _gain_control; boost::shared_ptr _solo_control; boost::shared_ptr _mute_control; @@ -136,7 +144,8 @@ class LIBARDOUR_API VCA : public Stripable, public Automatable, public boost::en static gint next_number; - void solo_mute_target_going_away (boost::weak_ptr); + void solo_target_going_away (boost::weak_ptr); + void mute_target_going_away (boost::weak_ptr); bool soloed_locked () const; bool muted_locked () const; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index edffc3f3ce..5332a70036 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5899,7 +5899,8 @@ void Route::vca_assign (boost::shared_ptr vca) { _gain_control->add_master (vca); - vca->add_solo_mute_target (shared_from_this()); + vca->add_solo_target (shared_from_this()); + vca->add_mute_target (shared_from_this()); } void @@ -5911,6 +5912,7 @@ Route::vca_unassign (boost::shared_ptr vca) /* XXXX need to remove from solo/mute target lists */ } else { _gain_control->remove_master (vca); - vca->remove_solo_mute_target (shared_from_this()); + vca->remove_solo_target (shared_from_this()); + vca->remove_mute_target (shared_from_this()); } } diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc index 2616549e17..8c4fe260ec 100644 --- a/libs/ardour/vca.cc +++ b/libs/ardour/vca.cc @@ -137,47 +137,45 @@ VCA::set_state (XMLNode const& node, int version) } void -VCA::add_solo_mute_target (boost::shared_ptr r) +VCA::add_solo_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))); + Glib::Threads::RWLock::WriterLock lm (solo_lock); + solo_targets.push_back (r); + r->DropReferences.connect_same_thread (solo_connections, boost::bind (&VCA::solo_target_going_away, this, boost::weak_ptr (r))); } void -VCA::remove_solo_mute_target (boost::shared_ptr r) +VCA::remove_solo_target (boost::shared_ptr r) { - Glib::Threads::RWLock::WriterLock lm (solo_mute_lock); - solo_mute_targets.remove (r); + Glib::Threads::RWLock::WriterLock lm (solo_lock); + solo_targets.remove (r); } void -VCA::solo_mute_target_going_away (boost::weak_ptr wr) +VCA::solo_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); + remove_solo_target (r); } void VCA::set_solo (bool yn) { { - Glib::Threads::RWLock::ReaderLock lm (solo_mute_lock); + Glib::Threads::RWLock::ReaderLock lm (solo_lock); if (yn == _solo_requested) { return; } - if (solo_mute_targets.empty()) { + if (solo_targets.empty()) { return; } - boost::shared_ptr rl (new RouteList (solo_mute_targets)); + boost::shared_ptr rl (new RouteList (solo_targets)); if (Config->get_solo_control_is_listen_control()) { _session.set_listen (rl, yn, Session::rt_cleanup, Controllable::NoGroup); @@ -189,16 +187,41 @@ VCA::set_solo (bool yn) _solo_requested = yn; } +void +VCA::add_mute_target (boost::shared_ptr r) +{ + Glib::Threads::RWLock::WriterLock lm (mute_lock); + mute_targets.push_back (r); + r->DropReferences.connect_same_thread (mute_connections, boost::bind (&VCA::mute_target_going_away, this, boost::weak_ptr (r))); +} + +void +VCA::remove_mute_target (boost::shared_ptr r) +{ + Glib::Threads::RWLock::WriterLock lm (mute_lock); + mute_targets.remove (r); +} + +void +VCA::mute_target_going_away (boost::weak_ptr wr) +{ + boost::shared_ptr r (wr.lock()); + if (!r) { + return; + } + remove_mute_target (r); +} + void VCA::set_mute (bool yn) { { - Glib::Threads::RWLock::ReaderLock lm (solo_mute_lock); + Glib::Threads::RWLock::ReaderLock lm (mute_lock); if (yn == _mute_requested) { return; } - boost::shared_ptr rl (new RouteList (solo_mute_targets)); + boost::shared_ptr rl (new RouteList (mute_targets)); _session.set_mute (rl, yn, Session::rt_cleanup, Controllable::NoGroup); } -- cgit v1.2.3