projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MuteMaster should (a) use a Muteable's own ::muted_by_others_soloing() (b) not try...
[ardour.git]
/
libs
/
ardour
/
solo_isolate_control.cc
diff --git
a/libs/ardour/solo_isolate_control.cc
b/libs/ardour/solo_isolate_control.cc
index e4d551168b7f1437ae1bc2162dfbfd5b95667150..3be57dc23d4e52cf270ffce31e61026d0195cc5c 100644
(file)
--- a/
libs/ardour/solo_isolate_control.cc
+++ b/
libs/ardour/solo_isolate_control.cc
@@
-84,8
+84,6
@@
SoloIsolateControl::mod_solo_isolated_by_upstream (int32_t delta)
}
if (solo_isolated() != old) {
}
if (solo_isolated() != old) {
- /* solo isolated status changed */
- _muteable.mute_master()->set_solo_ignore (solo_isolated());
Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
}
}
Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
}
}
@@
-118,14
+116,12
@@
SoloIsolateControl::set_solo_isolated (bool yn, Controllable::GroupControlDispos
if (yn) {
if (_solo_isolated == false) {
if (yn) {
if (_solo_isolated == false) {
- _muteable.mute_master()->set_solo_ignore (true);
changed = true;
}
_solo_isolated = true;
} else {
if (_solo_isolated == true) {
_solo_isolated = false;
changed = true;
}
_solo_isolated = true;
} else {
if (_solo_isolated == true) {
_solo_isolated = false;
- _muteable.mute_master()->set_solo_ignore (false);
changed = true;
}
}
changed = true;
}
}