summaryrefslogtreecommitdiff
path: root/libs/ardour/mute_control.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-04-23 13:04:08 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-31 15:30:41 -0400
commitd0f5958542a54bb7d463323be532e48540c84789 (patch)
tree1a36f4accc7db5607a100e0f097d57afb2aac574 /libs/ardour/mute_control.cc
parent0d62997eabf08397ea2c0c70e808abd4e79bcdbd (diff)
fix chaining of masters for boolean controls
Diffstat (limited to 'libs/ardour/mute_control.cc')
-rw-r--r--libs/ardour/mute_control.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/mute_control.cc b/libs/ardour/mute_control.cc
index d44189e36b..a3f46ffa06 100644
--- a/libs/ardour/mute_control.cc
+++ b/libs/ardour/mute_control.cc
@@ -120,7 +120,7 @@ double
MuteControl::get_value () const
{
if (slaved ()) {
- return get_masters_value ();
+ return muted_by_self() || get_masters_value ();
}
if (_list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback()) {
@@ -128,7 +128,7 @@ MuteControl::get_value () const
return AutomationControl::get_value();
}
- return muted() ? 1.0 : 0.0;
+ return muted();
}
void