diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-11 16:37:51 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:40 -0400 |
| commit | e1bcd70712b1aa35fa59d812d679576c88171d0f (patch) | |
| tree | e81c3f59f5a0c16ec9032154cea11c9ebbed199d /libs/ardour/mute_control.cc | |
| parent | 86a9fb2844730cf0b1468b1199a0898f4bb83dc7 (diff) | |
a slew of as-yet incomplete work to get VCA solo+mute closer to working
Diffstat (limited to 'libs/ardour/mute_control.cc')
| -rw-r--r-- | libs/ardour/mute_control.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libs/ardour/mute_control.cc b/libs/ardour/mute_control.cc index b0513d1138..a639cbda7a 100644 --- a/libs/ardour/mute_control.cc +++ b/libs/ardour/mute_control.cc @@ -40,21 +40,6 @@ MuteControl::MuteControl (Session& session, std::string const & name, Muteable& } void -MuteControl::master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd) -{ - bool master_muted; - - { - Glib::Threads::RWLock::ReaderLock lm (master_lock); - master_muted = (bool) get_masters_value_locked (); - } - - _muteable.mute_master()->mod_muted_by_others (master_muted ? 1 : -1); - - SlavableAutomationControl::master_changed (false, gcd); -} - -void MuteControl::actually_set_value (double val, Controllable::GroupControlDisposition gcd) { if (muted() != bool (val)) { @@ -111,5 +96,5 @@ MuteControl::muted () const bool MuteControl::muted_by_others () const { - return _muteable.mute_master()->muted_by_others (); + return _muteable.mute_master()->muted_by_others () || get_masters_value(); } |