diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-08 09:22:22 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:39 -0400 |
| commit | 9a0f4b1ef354f5ccc7cbe49a28b4a5eb35e0eb99 (patch) | |
| tree | bbf4e398c00b3c802cf0a1aba3917657da789027 /libs/ardour/ardour/vca.h | |
| parent | 04e26fe7e6cf0ae4d85a5527b30b5e1196966465 (diff) | |
move vca assignment up to the Route level (from GainControl)
Diffstat (limited to 'libs/ardour/ardour/vca.h')
| -rw-r--r-- | libs/ardour/ardour/vca.h | 21 |
1 files changed, 15 insertions, 6 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<Route>); - void remove_solo_mute_target (boost::shared_ptr<Route>); + void add_solo_target (boost::shared_ptr<Route>); + void remove_solo_target (boost::shared_ptr<Route>); + void add_mute_target (boost::shared_ptr<Route>); + void remove_mute_target (boost::shared_ptr<Route>); 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<GainControl> _gain_control; boost::shared_ptr<VCASoloControllable> _solo_control; boost::shared_ptr<VCAMuteControllable> _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<Route>); + void solo_target_going_away (boost::weak_ptr<Route>); + void mute_target_going_away (boost::weak_ptr<Route>); bool soloed_locked () const; bool muted_locked () const; |