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 a0207f9817e83180354b6b28afd7f8ee659500bc..d0e261e059255566dc2d9345dc0dab973fa46133 100644 (file)
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -20,69 +20,72 @@
 #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 MuteMaster : public SessionHandleRef, public PBD::Stateful
+class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
 {
-  public:
+public:
+       /** deliveries to mute when the channel is "muted" */
        enum MutePoint {
-               PreFader  = 0x1,
-               PostFader = 0x2,
-               Listen    = 0x4,
-               Main      = 0x8
+               PreFader  = 0x1, ///< mute all pre-fader sends
+               PostFader = 0x2, ///< mute all post-fader sends
+               Listen    = 0x4, ///< mute listen out
+               Main      = 0x8  ///< mute main out
        };
 
        static const MutePoint AllPoints;
 
-       MuteMaster (Session& s, const std::string& name);
+       MuteMaster (Session& s, Muteable&, const std::string& name);
        ~MuteMaster() {}
 
-       bool self_muted() const { return _self_muted && (_mute_point != MutePoint (0)); }
-       bool muted_by_others() const { return _muted_by_others && (_mute_point != MutePoint (0)); }
-       bool muted() const { return (_self_muted || (_muted_by_others > 0)) && (_mute_point != MutePoint (0)); }
-        bool muted_at (MutePoint mp) const { return (_self_muted || (_muted_by_others > 0)) && (_mute_point & mp); }
-        bool self_muted_at (MutePoint mp) const { return _self_muted && (_mute_point & mp); }
-        bool muted_by_others_at (MutePoint mp) const { return (_muted_by_others > 0) && (_mute_point & mp); }
-
-       bool muted_pre_fader() const  { return muted_at (PreFader); }
-       bool muted_post_fader() const { return muted_at (PostFader); }
-       bool muted_listen() const     { return muted_at (Listen); }
-        bool muted_main () const      { return muted_at (Main); }
+       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_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;
 
-        void set_self_muted (bool yn) { _self_muted = yn; }
-        void mod_muted_by_others (int delta);
-        void clear_muted_by_others ();
+       void set_muted_by_self (bool yn) { _muted_by_self = yn; }
 
        void mute_at (MutePoint);
        void unmute_at (MutePoint);
 
        void set_mute_points (const std::string& mute_point);
-        void set_mute_points (MutePoint);
-        MutePoint mute_points() const { return _mute_point; }
+       void set_mute_points (MutePoint);
+       MutePoint mute_points() const { return _mute_point; }
 
-        void set_solo_level (SoloLevel);
+       void set_soloed_by_self (bool yn) { _soloed_by_self = yn; }
+       void set_soloed_by_others (bool yn) { _soloed_by_others = yn; }
+
+       void set_muted_by_masters (bool);
 
        PBD::Signal0<void> MutePointChanged;
 
        XMLNode& get_state();
        int set_state(const XMLNode&, int version);
-
-  private:
-       volatile MutePoint _mute_point;
-        volatile bool      _self_muted;
-        volatile uint32_t  _muted_by_others;
-        volatile SoloLevel _solo_level;
+       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      _muted_by_masters;
 };
 
 } // namespace ARDOUR