diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-20 16:10:11 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-20 16:10:11 -0400 |
| commit | 52d746c5fb39263a42dd33de12e101c3fbeafaa9 (patch) | |
| tree | 70a7db99a454b0d77ef0239684719da2f8ad5f67 /libs/ardour/ardour/mute_master.h | |
| parent | 316562ee9e04edccff6de5f97618cbd59ef12755 (diff) | |
MuteMaster should (a) use a Muteable's own ::muted_by_others_soloing() (b) not try to use its own _solo_ignore to track Muteable::can_solo() or solo isolate state
Diffstat (limited to 'libs/ardour/ardour/mute_master.h')
| -rw-r--r-- | libs/ardour/ardour/mute_master.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h index 6f5999efb4..f73ce09565 100644 --- a/libs/ardour/ardour/mute_master.h +++ b/libs/ardour/ardour/mute_master.h @@ -33,6 +33,7 @@ namespace ARDOUR { class Session; +class Muteable; class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful { @@ -47,7 +48,7 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful static const MutePoint AllPoints; - MuteMaster (Session& s, const std::string& name); + MuteMaster (Session& s, Muteable&, const std::string& name); ~MuteMaster() {} bool muted_by_self () const { return _muted_by_self && (_mute_point != MutePoint (0)); } @@ -69,7 +70,6 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful 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; } void set_muted_by_masters (bool); @@ -80,11 +80,11 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful static const std::string xml_node_name; private: + Muteable* _muteable; MutePoint _mute_point; bool _muted_by_self; bool _soloed_by_self; bool _soloed_by_others; - bool _solo_ignore; bool _muted_by_masters; }; |