perhaps, just possibly, a working solo model. needs to be fixed so that connections...

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

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 9aea8f981ad76ac2db9b6c500769216b24b86d36..df9a66ef7f60d9642c1eac0f114e1c4c8c08ac26 100644 (file)
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -19,31 +19,28 @@
 */
 
 #include "pbd/enumwriter.h"
+#include "pbd/xml++.h"
 
+#include "ardour/types.h"
 #include "ardour/mute_master.h"
-#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
-
-MuteMaster::MuteMaster (Session& s, const std::string& name)
-       : AutomationControl (s, Evoral::Parameter (MuteAutomation), boost::shared_ptr<AutomationList>(), name)
-       , _mute_point (MutePoint (0))
+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)
+        , _self_muted (false)
+        , _muted_by_others (0)
 {
-       // default range for parameter is fine
-
-       _automation = new AutomationList (MuteAutomation);
-       set_list (boost::shared_ptr<AutomationList>(_automation));
-}
-
-void
-MuteMaster::clear_mute ()
-{
-       if (_mute_point != MutePoint (0)) {
-               _mute_point = MutePoint (0);
-               MutePointChanged (); // EMIT SIGNAL
-       }
 }
 
 void
@@ -51,6 +48,7 @@ MuteMaster::mute_at (MutePoint mp)
 {
        if ((_mute_point & mp) != mp) {
                _mute_point = MutePoint (_mute_point | mp);
+                cerr << "Mute point set, now " << _mute_point << endl;
                MutePointChanged (); // EMIT SIGNAL
        }
 }
@@ -60,57 +58,123 @@ MuteMaster::unmute_at (MutePoint mp)
 {
        if ((_mute_point & mp) == mp) {
                _mute_point = MutePoint (_mute_point & ~mp);
+                cerr << "Mute point unset, now " << _mute_point << endl;
                MutePointChanged (); // EMIT SIGNAL
        }
 }
 
 void
-MuteMaster::mute (bool yn)
+MuteMaster::clear_muted_by_others ()
 {
-       /* convenience wrapper around AutomationControl method */
+        _muted_by_others = 0;
+}
 
-       if (yn) {
-               set_value ((float) 0xffff);
+void
+MuteMaster::mod_muted_by_others (int32_t delta)
+{
+       if (delta < 0) {
+               if (_muted_by_others >= (uint32_t) abs (delta)) {
+                       _muted_by_others += delta;
+               } else {
+                       _muted_by_others = 0;
+               }
        } else {
-               set_value (0.0f);
+               _muted_by_others += delta;
        }
 }
 
+void
+MuteMaster::set_solo_level (SoloLevel l)
+{
+        _solo_level = l;
+}
+
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
-       if (_mute_point & mp) {
-               return Config->get_solo_mute_gain ();
-       } else {
-               return 1.0;
-       }
+        gain_t gain;
+        const SoloLevel l = _solo_level;
+
+        // cerr << "solo level = " << _solo_level << " selfmuted " <<  self_muted_at (mp) << " omute " << muted_by_others_at (mp) << endl;
+        
+        if (Config->get_solo_mute_override()) {
+                if ((l == SelfSoloed) || (l == DownstreamSoloed)) { 
+                        gain = 1.0;
+                } else if (self_muted_at (mp)) { // self-muted 
+                        gain = Config->get_solo_mute_gain ();
+                } else if (l == UpstreamSoloed) {
+                        gain = 1.0;
+                } else if (muted_by_others_at (mp)) { // muted by others
+                        gain = Config->get_solo_mute_gain ();
+                } else {
+                        gain = 1.0;
+                }
+        } else {
+                if (self_muted_at (mp)) { // self-muted 
+                        gain = Config->get_solo_mute_gain ();
+                } else if ((l == SelfSoloed) || (l == DownstreamSoloed)) {
+                        gain = 1.0;
+                } else if (muted_by_others_at (mp)) { // muted by others
+                        gain = Config->get_solo_mute_gain ();
+                } else if (l == UpstreamSoloed) { // soloed by others
+                        gain = 1.0;
+                } else {
+                        gain = 1.0;
+                }
+        }
+
+        // cerr << "\tgain = " << gain << endl;
+        
+        return gain;
 }
 
 void
-MuteMaster::set_value (float f)
+MuteMaster::set_mute_points (const std::string& mute_point)
 {
-       MutePoint old = _mute_point;
-       _mute_point = (MutePoint) (rint (f));
-       if (old != _mute_point) {
-               MutePointChanged (); // EMIT SIGNAL
-       }
+        MutePoint old = _mute_point;
+
+       _mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
+        cerr << "Mute point set from string, now " << _mute_point << endl;
+        
+        if (old != _mute_point) {
+                MutePointChanged(); /* EMIT SIGNAL */
+        }
 }
 
-float
-MuteMaster::get_value () const
+void
+MuteMaster::set_mute_points (MutePoint mp) 
 {
-       return (float) _mute_point;
+        if (_mute_point != mp) {
+                _mute_point = mp;
+                cerr << "Mute point set from mp, now " << _mute_point << endl;
+                MutePointChanged (); /* EMIT SIGNAL */
+        }
 }
 
 int
-MuteMaster::set_state (const XMLNode& node)
+MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
        const XMLProperty* prop;
 
        if ((prop = node.property ("mute-point")) != 0) {
                _mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
+                cerr << "Mute point set from STATE string, now " << _mute_point << endl;
        }
 
+       if ((prop = node.property ("muted")) != 0) {
+               _self_muted = string_is_affirmative (prop->value());
+       } else {
+                _self_muted = (_mute_point != MutePoint (0));
+        }
+
+        if ((prop = node.property ("muted-by-others")) != 0) {
+                if (sscanf (prop->value().c_str(), "%u", &_muted_by_others) != 1) {
+                        _muted_by_others = 0;
+                }
+        } else {
+                _muted_by_others = 0;
+        }
+
        return 0;
 }
 
@@ -119,5 +183,11 @@ MuteMaster::get_state()
 {
        XMLNode* node = new XMLNode (X_("MuteMaster"));
        node->add_property ("mute-point", enum_2_string (_mute_point));
+       node->add_property ("muted", (_self_muted ? X_("yes") : X_("no")));
+
+        char buf[32];
+        snprintf (buf, sizeof (buf), "%u", _muted_by_others);
+       node->add_property ("muted-by-others", buf);
+
        return *node;
 }