more solo model work, including a GUI fix for mute button state when the route is...

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

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index b3b3d2372427d0e4e28245b090e462033cd3405a..5e49a11875ad7fbd4b7f742d21fa42841f98bb3d 100644 (file)
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -23,38 +23,33 @@
 
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
-#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace std;
 
 const MuteMaster::MutePoint MuteMaster::AllPoints = MutePoint (MuteMaster::PreFader|
                                                               MuteMaster::PostFader|
                                                               MuteMaster::Listen|
                                                               MuteMaster::Main);
 
-MuteMaster::MuteMaster (Session&, const std::string&)
-       : _mute_point (MutePoint (0))
+MuteMaster::MuteMaster (Session& s, const std::string&)
+       : SessionHandleRef (s) 
+        , _mute_point (AllPoints)
         , _self_muted (false)
         , _muted_by_others (0)
+        , _solo_ignore (false)
 {
 }
 
-void
-MuteMaster::clear_mute ()
-{
-       if (_mute_point != MutePoint (0)) {
-               _mute_point = MutePoint (0);
-               MutePointChanged (); // EMIT SIGNAL
-       }
-}
-
 void
 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
        }
 }
@@ -64,10 +59,17 @@ 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::clear_muted_by_others ()
+{
+        _muted_by_others = 0;
+}
+
 void
 MuteMaster::mod_muted_by_others (int32_t delta)
 {
@@ -82,14 +84,57 @@ MuteMaster::mod_muted_by_others (int32_t delta)
        }
 }
 
+void
+MuteMaster::set_solo_level (SoloLevel l)
+{
+        _solo_level = l;
+}
+
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
-       if (muted_at (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 {
+                        if (!_solo_ignore && _session.soloing()) {
+                                gain = 0.0;
+                        } 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 {
+                        if (!_solo_ignore && _session.soloing()) {
+                                gain = 0.0;
+                        } else {
+                                gain = 1.0;
+                        }
+                }
+        }
+        
+        // cerr << "\tgain = " << gain << endl;
+        
+        return gain;
 }
 
 void
@@ -98,7 +143,8 @@ MuteMaster::set_mute_points (const std::string& mute_point)
         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 */
         }
@@ -109,6 +155,7 @@ MuteMaster::set_mute_points (MutePoint mp)
 {
         if (_mute_point != mp) {
                 _mute_point = mp;
+                cerr << "Mute point set from mp, now " << _mute_point << endl;
                 MutePointChanged (); /* EMIT SIGNAL */
         }
 }
@@ -120,6 +167,7 @@ MuteMaster::set_state (const XMLNode& node, int /*version*/)
 
        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) {