summaryrefslogtreecommitdiff
path: root/libs/ardour/route.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-07-20 16:10:11 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-07-20 16:10:11 -0400
commit52d746c5fb39263a42dd33de12e101c3fbeafaa9 (patch)
tree70a7db99a454b0d77ef0239684719da2f8ad5f67 /libs/ardour/route.cc
parent316562ee9e04edccff6de5f97618cbd59ef12755 (diff)
MuteMaster should (a) use a Muteable's own ::muted_by_others_soloing() (b) not try to use its own _solo_ignore to track Muteable::can_solo() or solo isolate state
Diffstat (limited to 'libs/ardour/route.cc')
-rw-r--r--libs/ardour/route.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index d072d81c88..36d1791f9f 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -229,10 +229,6 @@ Route::init ()
_monitor_control->activate ();
}
- if (is_master() || is_monitor() || is_auditioner()) {
- _mute_master->set_solo_ignore (true);
- }
-
/* now that we have _meter, its safe to connect to this */
{
@@ -2352,10 +2348,6 @@ Route::set_state (const XMLNode& node, int version)
_strict_io = string_is_affirmative (prop->value());
}
- if (!can_solo()) {
- _mute_master->set_solo_ignore (true);
- }
-
if (is_monitor()) {
/* monitor bus does not get a panner, but if (re)created
via XML, it will already have one by the time we
@@ -2502,10 +2494,6 @@ Route::set_state_2X (const XMLNode& node, int version)
Stripable::set_state (node, version);
- if (is_master() || is_monitor() || is_auditioner()) {
- _mute_master->set_solo_ignore (true);
- }
-
if ((prop = node.property (X_("denormal-protection"))) != 0) {
set_denormal_protection (string_is_affirmative (prop->value()));
}
@@ -5262,7 +5250,7 @@ Route::muted_by_others_soloing () const
return false;
}
- return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
+ return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
}
void