Merge branch 'master' into cairocanvas

[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 ad383d88339668ba7197c00b959eff4e5881d380..460c7bf48ba6e65ac688b6fafdd0aff4d3c4ed3b 100644 (file)
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -34,11 +34,12 @@ class Session;
 class MuteMaster : public SessionHandleRef, public PBD::Stateful
 {
   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;
@@ -46,33 +47,23 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful
        MuteMaster (Session& s, 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_at (MutePoint mp) const;
 
        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_solo_ignore (bool yn) { _solo_ignore = yn; }
+       void set_soloed (bool);
+       void set_solo_ignore (bool yn) { _solo_ignore = yn; }
 
        PBD::Signal0<void> MutePointChanged;
 
@@ -81,10 +72,9 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful
 
   private:
        volatile MutePoint _mute_point;
-        volatile bool      _self_muted;
-        volatile uint32_t  _muted_by_others;
-        volatile SoloLevel _solo_level;
-        volatile bool      _solo_ignore;
+       volatile bool      _muted_by_self;
+       volatile bool      _soloed;
+       volatile bool      _solo_ignore;
 };
 
 } // namespace ARDOUR