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 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'libs/ardour/ardour/vca.h') 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; -- cgit v1.2.3