Optimize automation-event process splitting

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

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index c0e5ca836823324c285e701082909f031182676d..9cc424b84d743fe8b1d7a6b90a1b68c97dd8c106 100644 (file)
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -1,5 +1,4 @@
 /*
-
     Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -20,24 +19,36 @@
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
+#include "pbd/enum_convert.h"
 
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+       DEFINE_ENUM_CONVERT(ARDOUR::MuteMaster::MutePoint);
+}
 
 using namespace ARDOUR;
 using namespace std;
 
-MuteMaster::MuteMaster (Session& s, const std::string&)
+const string MuteMaster::xml_node_name (X_("MuteMaster"));
+
+const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint(
+       PreFader|PostFader|Listen|Main);
+
+MuteMaster::MuteMaster (Session& s, Muteable& m, const std::string&)
        : SessionHandleRef (s)
+       , _muteable (&m)
        , _mute_point (MutePoint (0))
-        , _muted_by_self (false)
-        , _soloed (false)
-        , _solo_ignore (false)
+       , _muted_by_self (false)
+       , _soloed_by_self (false)
+       , _soloed_by_others (false)
+       , _muted_by_masters (0)
 {
-       
+
        if (Config->get_mute_affects_pre_fader ()) {
                _mute_point = MutePoint (_mute_point | PreFader);
        }
@@ -73,97 +84,90 @@ MuteMaster::unmute_at (MutePoint mp)
        }
 }
 
-void
-MuteMaster::set_soloed (bool yn)
-{
-        _soloed = yn;
-}
-
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
-        gain_t gain;
-
-        if (Config->get_solo_mute_override()) {
-                if (_soloed) {
-                        gain = 1.0;
-                } else if (muted_by_self_at (mp)) {
-                        gain = 0.0;
-                } else {
-                        if (muted_by_others_at (mp)) {
-                                gain = Config->get_solo_mute_gain ();
-                        } else {
-                                gain = 1.0;
-                        }
-                }
-        } else {
-                if (muted_by_self_at (mp)) {
-                        gain = 0.0;
-                } else if (_soloed) {
-                        gain = 1.0;
-                } else {
-                        if (muted_by_others_at (mp)) {
-                                gain = Config->get_solo_mute_gain ();
-                        } else {
-                                gain = 1.0;
-                        }
-                }
-        }
-        
-        return gain;
+       gain_t gain;
+
+       if (Config->get_solo_mute_override()) {
+               if (_soloed_by_self) {
+                       gain = GAIN_COEFF_UNITY;
+               } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+                       gain = GAIN_COEFF_ZERO;
+               } else {
+                       if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
+                               gain = Config->get_solo_mute_gain ();
+                       } else {
+                               gain = GAIN_COEFF_UNITY;
+                       }
+               }
+       } else {
+               if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+                       gain = GAIN_COEFF_ZERO;
+               } else if (_soloed_by_self || _soloed_by_others) {
+                       gain = GAIN_COEFF_UNITY;
+               } else {
+                       if (muted_by_others_soloing_at (mp)) {
+                               gain = Config->get_solo_mute_gain ();
+                       } else {
+                               gain = GAIN_COEFF_UNITY;
+                       }
+               }
+       }
+
+       return gain;
 }
 
 void
 MuteMaster::set_mute_points (const std::string& mute_point)
 {
-        MutePoint old = _mute_point;
+       MutePoint old = _mute_point;
 
        _mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
-        
-        if (old != _mute_point) {
-                MutePointChanged(); /* EMIT SIGNAL */
-        }
+
+       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;
-                MutePointChanged (); /* EMIT SIGNAL */
-        }
+       if (_mute_point != mp) {
+               _mute_point = mp;
+               MutePointChanged (); /* EMIT SIGNAL */
+       }
 }
 
 int
 MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
-       const XMLProperty* prop;
+       node.get_property ("mute-point", _mute_point);
 
-       if ((prop = node.property ("mute-point")) != 0) {
-               _mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
+       if (!node.get_property ("muted", _muted_by_self)) {
+               _muted_by_self = (_mute_point != MutePoint (0));
        }
 
-       if ((prop = node.property ("muted")) != 0) {
-               _muted_by_self = string_is_affirmative (prop->value());
-       } else {
-                _muted_by_self = (_mute_point != MutePoint (0));
-        }
-
        return 0;
 }
 
 XMLNode&
 MuteMaster::get_state()
 {
-       XMLNode* node = new XMLNode (X_("MuteMaster"));
-       node->add_property ("mute-point", enum_2_string (_mute_point));
-       node->add_property ("muted", (_muted_by_self ? X_("yes") : X_("no")));
+       XMLNode* node = new XMLNode (xml_node_name);
+       node->set_property ("mute-point", _mute_point);
+       node->set_property ("muted", _muted_by_self);
        return *node;
 }
 
 bool
-MuteMaster::muted_by_others_at (MutePoint mp) const
+MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
+{
+       return _muteable->muted_by_others_soloing() && (_mute_point & mp);
+}
+
+void
+MuteMaster::set_muted_by_masters (bool yn)
 {
-       return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
+       _muted_by_masters = yn;
 }
-