ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

SiP and "solo overrides mutes" tweak: 

Only Explicit solos should override mutes.
This commit is contained in:
Robin Gareus 2015-10-05 14:19:32 +02:00
parent f42ae066cc
commit e11ba7b79d
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/mute_master.h
View File

@ -62,7 +62,8 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
void set_mute_points (MutePoint);
MutePoint mute_points() const { return _mute_point; }
void set_soloed (bool);
void set_soloed_by_self (bool yn) { _soloed_by_self = yn; }
void set_soloed_by_others (bool yn) { _soloed_by_others = yn; }
void set_solo_ignore (bool yn) { _solo_ignore = yn; }
PBD::Signal0<void> MutePointChanged;
@ -73,7 +74,8 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
private:
volatile MutePoint _mute_point;
volatile bool _muted_by_self;
volatile bool _soloed;
volatile bool _soloed_by_self;
volatile bool _soloed_by_others;
volatile bool _solo_ignore;
};

15
libs/ardour/mute_master.cc
View File

@ -38,7 +38,8 @@ MuteMaster::MuteMaster (Session& s, const std::string&)
: SessionHandleRef (s)
, _mute_point (MutePoint (0))
, _muted_by_self (false)
, _soloed (false)
, _soloed_by_self (false)
, _soloed_by_others (false)
, _solo_ignore (false)
{
@ -77,24 +78,18 @@ MuteMaster::unmute_at (MutePoint mp)
}
}
void
MuteMaster::set_soloed (bool yn)
{
_soloed = yn;
}
gain_t
MuteMaster::mute_gain_at (MutePoint mp) const
{
gain_t gain;
if (Config->get_solo_mute_override()) {
if (_soloed) {
if (_soloed_by_self) {
gain = GAIN_COEFF_UNITY;
} else if (muted_by_self_at (mp)) {
gain = GAIN_COEFF_ZERO;
} else {
if (muted_by_others_at (mp)) {
if (muted_by_others_at (mp) && !_soloed_by_others) {
gain = Config->get_solo_mute_gain ();
} else {
gain = GAIN_COEFF_UNITY;
@ -103,7 +98,7 @@ MuteMaster::mute_gain_at (MutePoint mp) const
} else {
if (muted_by_self_at (mp)) {
gain = GAIN_COEFF_ZERO;
} else if (_soloed) {
} else if (_soloed_by_self || _soloed_by_others) {
gain = GAIN_COEFF_UNITY;
} else {
if (muted_by_others_at (mp)) {

8
libs/ardour/route.cc
View File

@ -779,11 +779,12 @@ Route::set_listen (bool yn, void* src)
if (yn != _monitor_send->active()) {
if (yn) {
_monitor_send->activate ();
_mute_master->set_soloed (true);
_mute_master->set_soloed_by_self (true);
} else {
_monitor_send->deactivate ();
_mute_master->set_soloed (false);
_mute_master->set_soloed_by_self (false);
}
_mute_master->set_soloed_by_others (false);
listen_changed (src); /* EMIT SIGNAL */
}
@ -949,7 +950,8 @@ Route::mod_solo_by_others_downstream (int32_t delta)
void
Route::set_mute_master_solo ()
{
_mute_master->set_soloed (self_soloed() || soloed_by_others_downstream() || soloed_by_others_upstream());
_mute_master->set_soloed_by_self (self_soloed());
_mute_master->set_soloed_by_others (soloed_by_others_downstream() || soloed_by_others_upstream());
}
void