this might just be it for solo
git-svn-id: svn://localhost/ardour2/branches/3.0@7056 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
056ceba16a
commit
9a1cce915b
@ -635,21 +635,15 @@ Route::mod_solo_by_others_upstream (int32_t delta)
|
||||
not in reverse.
|
||||
*/
|
||||
|
||||
cerr << name() << " SbU ... latched solo? " << Config->get_solo_latched() << " delta = " << delta << endl;
|
||||
cerr << name() << " SbU ... sbd = " << _soloed_by_others_downstream
|
||||
<< " ss = " << _self_solo << " latched solo? " << Config->get_solo_latched() << " delta = "
|
||||
<< delta << endl;
|
||||
|
||||
bool push_inverse = false;
|
||||
if ((_self_solo || _soloed_by_others_downstream) &&
|
||||
((old_sbu == 0 && _soloed_by_others_upstream > 0) ||
|
||||
(old_sbu > 0 && _soloed_by_others_upstream == 0))) {
|
||||
|
||||
if (old_sbu > 0 && _soloed_by_others_upstream == 0 && _self_solo) {
|
||||
/* we went back to non-soloed-by-others-upstream but we're still soloed push */
|
||||
push_inverse = true;
|
||||
}
|
||||
|
||||
if (old_sbu == 0 && _soloed_by_others_upstream > 0) {
|
||||
/* upstream made us solo when we weren't before */
|
||||
push_inverse = true;
|
||||
}
|
||||
|
||||
if (push_inverse) {
|
||||
if (delta > 0 || Config->get_solo_latched()) {
|
||||
cerr << "\t ... INVERT push\n";
|
||||
for (FedBy::iterator i = _fed_by.begin(); i != _fed_by.end(); ++i) {
|
||||
boost::shared_ptr<Route> sr = i->r.lock();
|
||||
@ -657,6 +651,9 @@ Route::mod_solo_by_others_upstream (int32_t delta)
|
||||
sr->mod_solo_by_others_downstream (-delta);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
cerr << "\t... skip invert push\n";
|
||||
}
|
||||
}
|
||||
|
||||
set_mute_master_solo ();
|
||||
|
Loading…
Reference in New Issue
Block a user