namespace ARDOUR {
class Session;
+class Muteable;
class LIBARDOUR_API MuteMaster : public SessionHandleRef, public PBD::Stateful
{
static const MutePoint AllPoints;
- MuteMaster (Session& s, const std::string& name);
+ MuteMaster (Session& s, Muteable&, const std::string& name);
~MuteMaster() {}
bool muted_by_self () const { return _muted_by_self && (_mute_point != MutePoint (0)); }
void set_soloed_by_self (bool yn) { _soloed_by_self = yn; }
void set_soloed_by_others (bool yn) { _soloed_by_others = yn; }
- void set_solo_ignore (bool yn) { _solo_ignore = yn; }
void set_muted_by_masters (bool);
static const std::string xml_node_name;
private:
+ Muteable* _muteable;
MutePoint _mute_point;
bool _muted_by_self;
bool _soloed_by_self;
bool _soloed_by_others;
- bool _solo_ignore;
bool _muted_by_masters;
};
const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint(
PreFader|PostFader|Listen|Main);
-MuteMaster::MuteMaster (Session& s, const std::string&)
+MuteMaster::MuteMaster (Session& s, Muteable& m, const std::string&)
: SessionHandleRef (s)
+ , _muteable (&m)
, _mute_point (MutePoint (0))
, _muted_by_self (false)
, _soloed_by_self (false)
, _soloed_by_others (false)
- , _solo_ignore (false)
, _muted_by_masters (0)
{
bool
MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
{
- /* note: this is currently called with the assumption that the owner is
- not soloed. it does not test for this condition.
- */
- return (!_solo_ignore && _session.soloing()) && (_mute_point & mp);
+ return _muteable->muted_by_others_soloing() && (_mute_point & mp);
}
void
using namespace ARDOUR;
Muteable::Muteable (Session& s, std::string const & name)
- : _mute_master (new MuteMaster (s, name))
+ : _mute_master (new MuteMaster (s, *this, name))
{
}
_monitor_control->activate ();
}
- if (is_master() || is_monitor() || is_auditioner()) {
- _mute_master->set_solo_ignore (true);
- }
-
/* now that we have _meter, its safe to connect to this */
{
_strict_io = string_is_affirmative (prop->value());
}
- if (!can_solo()) {
- _mute_master->set_solo_ignore (true);
- }
-
if (is_monitor()) {
/* monitor bus does not get a panner, but if (re)created
via XML, it will already have one by the time we
Stripable::set_state (node, version);
- if (is_master() || is_monitor() || is_auditioner()) {
- _mute_master->set_solo_ignore (true);
- }
-
if ((prop = node.property (X_("denormal-protection"))) != 0) {
set_denormal_protection (string_is_affirmative (prop->value()));
}
return false;
}
- return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
+ return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated();
}
void
if ((*i)->solo_isolate_control()->solo_isolated() || !(*i)->can_solo()) {
/* route does not get solo propagated to it */
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 excluded from solo because iso = %2 can_solo = %3\n", (*i)->name(), (*i)->solo_isolate_control()->solo_isolated(),
+ (*i)->can_solo()));
continue;
}
}
if (solo_isolated() != old) {
- /* solo isolated status changed */
- _muteable.mute_master()->set_solo_ignore (solo_isolated());
Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
}
}
if (yn) {
if (_solo_isolated == false) {
- _muteable.mute_master()->set_solo_ignore (true);
changed = true;
}
_solo_isolated = true;
} else {
if (_solo_isolated == true) {
_solo_isolated = false;
- _muteable.mute_master()->set_solo_ignore (false);
changed = true;
}
}