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

git-svn-id: svn://localhost/ardour2/branches/3.0@7048 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 0 deletions

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index ddb227c6bb..33af0f8abf 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -165,6 +165,10 @@ Route::init ()
                 _main_outs->panner()->set_bypassed (true);
 	}
 
+        if (is_master() || is_monitor() || is_hidden()) {
+                _mute_master->set_solo_ignore (true);
+        }
+
 	/* now that we have _meter, its safe to connect to this */
 
 	Metering::Meter.connect_same_thread (*this, (boost::bind (&Route::meter, this)));
@@ -1795,6 +1799,10 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/)
 		_flags = Flag (0);
 	}
 
+        if (is_master() || is_monitor() || is_hidden()) {
+                _mute_master->set_solo_ignore (true);
+        }
+
 	/* add all processors (except amp, which is always present) */
 
 	nlist = node.children();