mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-16 02:16:09 +01:00
lincoln's solo-mute-override should only take effect soloing in place
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4255 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
cbd258bc09
commit
33b4d64094
2 changed files with 18 additions and 7 deletions
|
|
@ -824,16 +824,23 @@ Route::set_solo (bool yn, void *src)
|
|||
void
|
||||
Route::catch_up_on_solo_mute_override ()
|
||||
{
|
||||
Glib::Mutex::Lock lm (declick_lock);
|
||||
if (Config->get_solo_model() != InverseMute) {
|
||||
return;
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
if (_muted) {
|
||||
if (Config->get_solo_mute_override()) {
|
||||
desired_mute_gain = (_soloed?1.0:0.0);
|
||||
Glib::Mutex::Lock lm (declick_lock);
|
||||
|
||||
if (_muted) {
|
||||
if (Config->get_solo_mute_override()) {
|
||||
desired_mute_gain = (_soloed?1.0:0.0);
|
||||
} else {
|
||||
desired_mute_gain = 0.0;
|
||||
}
|
||||
} else {
|
||||
desired_mute_gain = 0.0;
|
||||
desired_mute_gain = 1.0;
|
||||
}
|
||||
} else {
|
||||
desired_mute_gain = 1.0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2406,6 +2406,10 @@ Session::catch_up_on_solo ()
|
|||
void
|
||||
Session::catch_up_on_solo_mute_override ()
|
||||
{
|
||||
if (Config->get_solo_model() != InverseMute) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* this is called whenever the param solo-mute-override is
|
||||
changed.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue