Fix set_loop() return value (amend 00a4ad)

[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 14597cb56b1aa906fd14bc2c74738fdcd5426bb2..d0e261e059255566dc2d9345dc0dab973fa46133 100644 (file)
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -20,20 +20,24 @@
 #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 {
 
 class Session;
+class Muteable;
 
 class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
 {
-  public:
+public:
        /** deliveries to mute when the channel is "muted" */
        enum MutePoint {
                PreFader  = 0x1, ///< mute all pre-fader sends
@@ -44,12 +48,14 @@ 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)); }
        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;
 
@@ -64,23 +70,22 @@ 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 mod_muted_by_others (int32_t delta);
-       bool muted_by_others () const { return _muted_by_others; }
+       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:
+private:
+       Muteable* _muteable;
        MutePoint _mute_point;
        bool      _muted_by_self;
        bool      _soloed_by_self;
        bool      _soloed_by_others;
-       bool      _solo_ignore;
-       int32_t   _muted_by_others;
+       bool      _muted_by_masters;
 };
 
 } // namespace ARDOUR