From e1bcd70712b1aa35fa59d812d679576c88171d0f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 11 Apr 2016 16:37:51 -0400 Subject: a slew of as-yet incomplete work to get VCA solo+mute closer to working --- libs/ardour/mute_control.cc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'libs/ardour/mute_control.cc') 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 @@ -39,21 +39,6 @@ MuteControl::MuteControl (Session& session, std::string const & name, Muteable& set_flags (Controllable::Flag (flags() | Controllable::RealTime)); } -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) { @@ -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(); } -- cgit v1.2.3