summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/mute_master.h
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-10-05 14:19:32 +0200
committerRobin Gareus <robin@gareus.org>2015-10-05 14:19:32 +0200
commite11ba7b79d68bc1070b170236c22123966d7bcc3 (patch)
tree496d95bf15d879c7e16b1130d5402df1ad55ad98 /libs/ardour/ardour/mute_master.h
parentf42ae066cc98359a9d2861b83c68dd102748fdcf (diff)
SiP and "solo overrides mutes" tweak:
Only Explicit solos should override mutes.
Diffstat (limited to 'libs/ardour/ardour/mute_master.h')
-rw-r--r--libs/ardour/ardour/mute_master.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h
index 8a83352a5b..d88cbdcd39 100644
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -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;
};