add mutex to prevent concurrent session state saves.

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

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 9a95e70a115ee83cd082126940ca79dab1d5839f..9f2ed08dab5ce5f7fd4af3000d34dec150d7708b 100644 (file)
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -20,6 +20,7 @@
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
+#include "pbd/convert.h"
 
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
@@ -30,18 +31,29 @@
 using namespace ARDOUR;
 using namespace std;
 
-const MuteMaster::MutePoint MuteMaster::AllPoints = MutePoint (MuteMaster::PreFader|
-                                                              MuteMaster::PostFader|
-                                                              MuteMaster::Listen|
-                                                              MuteMaster::Main);
-
 MuteMaster::MuteMaster (Session& s, const std::string&)
-       : SessionHandleRef (s) 
-        , _mute_point (AllPoints)
+       : SessionHandleRef (s)
+       , _mute_point (MutePoint (0))
         , _muted_by_self (false)
         , _soloed (false)
         , _solo_ignore (false)
 {
+
+       if (Config->get_mute_affects_pre_fader ()) {
+               _mute_point = MutePoint (_mute_point | PreFader);
+       }
+
+       if (Config->get_mute_affects_post_fader ()) {
+               _mute_point = MutePoint (_mute_point | PostFader);
+       }
+
+       if (Config->get_mute_affects_control_outs ()) {
+               _mute_point = MutePoint (_mute_point | Listen);
+       }
+
+       if (Config->get_mute_affects_main_outs ()) {
+               _mute_point = MutePoint (_mute_point | Main);
+       }
 }
 
 void
@@ -77,28 +89,28 @@ MuteMaster::mute_gain_at (MutePoint mp) const
                 if (_soloed) {
                         gain = 1.0;
                 } else if (muted_by_self_at (mp)) {
-                        gain = Config->get_solo_mute_gain ();
+                        gain = 0.0;
                 } else {
                         if (muted_by_others_at (mp)) {
-                                gain = 0.0;
+                                gain = Config->get_solo_mute_gain ();
                         } else {
                                 gain = 1.0;
                         }
                 }
         } else {
                 if (muted_by_self_at (mp)) {
-                        gain = Config->get_solo_mute_gain ();
+                        gain = 0.0;
                 } else if (_soloed) {
                         gain = 1.0;
                 } else {
                         if (muted_by_others_at (mp)) {
-                                gain = 0.0;
+                                gain = Config->get_solo_mute_gain ();
                         } else {
                                 gain = 1.0;
                         }
                 }
         }
-        
+
         return gain;
 }
 
@@ -108,14 +120,14 @@ MuteMaster::set_mute_points (const std::string& mute_point)
         MutePoint old = _mute_point;
 
        _mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
-        
+
         if (old != _mute_point) {
                 MutePointChanged(); /* EMIT SIGNAL */
         }
 }
 
 void
-MuteMaster::set_mute_points (MutePoint mp) 
+MuteMaster::set_mute_points (MutePoint mp)
 {
         if (_mute_point != mp) {
                 _mute_point = mp;
@@ -133,7 +145,7 @@ MuteMaster::set_state (const XMLNode& node, int /*version*/)
        }
 
        if ((prop = node.property ("muted")) != 0) {
-               _muted_by_self = string_is_affirmative (prop->value());
+               _muted_by_self = PBD::string_is_affirmative (prop->value());
        } else {
                 _muted_by_self = (_mute_point != MutePoint (0));
         }
@@ -155,4 +167,4 @@ MuteMaster::muted_by_others_at (MutePoint mp) const
 {
        return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
 }
-       
+