a better, deeper fix for "cancel all solo", as Session::cancel_all_solo()

[ardour.git] / libs / ardour / ardour / mute_master.h

diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h
index 8a83352a5bbd04f682db376a545057139ec418d6..6f5999efb44c8b704a440061900400fe15d78b12 100644 (file)
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -20,12 +20,15 @@
 #ifndef __ardour_mute_master_h__
 #define __ardour_mute_master_h__
 
-#include "evoral/Parameter.hpp"
+#include <string>
+
 #include "pbd/signals.h"
 #include "pbd/stateful.h"
-#include <string>
+
+#include "evoral/Parameter.hpp"
 
 #include "ardour/session_handle.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
@@ -49,7 +52,9 @@ class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
 
        bool muted_by_self () const { return _muted_by_self && (_mute_point != MutePoint (0)); }
        bool muted_by_self_at (MutePoint mp) const { return _muted_by_self && (_mute_point & mp); }
-       bool muted_by_others_at (MutePoint mp) const;
+       bool muted_by_others_soloing_at (MutePoint mp) const;
+       bool muted_by_masters () const { return _muted_by_masters && (_mute_point != MutePoint (0)); }
+       bool muted_by_masters_at (MutePoint mp) const { return _muted_by_masters && (_mute_point & mp); }
 
        gain_t mute_gain_at (MutePoint) const;
 
@@ -62,19 +67,25 @@ 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; }
 
+       void set_muted_by_masters (bool);
+
        PBD::Signal0<void> MutePointChanged;
 
        XMLNode& get_state();
        int set_state(const XMLNode&, int version);
+       static const std::string xml_node_name;
 
   private:
-       volatile MutePoint _mute_point;
-       volatile bool      _muted_by_self;
-       volatile bool      _soloed;
-       volatile bool      _solo_ignore;
+       MutePoint _mute_point;
+       bool      _muted_by_self;
+       bool      _soloed_by_self;
+       bool      _soloed_by_others;
+       bool      _solo_ignore;
+       bool      _muted_by_masters;
 };
 
 } // namespace ARDOUR