projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: whitespace
[ardour.git]
/
libs
/
ardour
/
solo_isolate_control.cc
diff --git
a/libs/ardour/solo_isolate_control.cc
b/libs/ardour/solo_isolate_control.cc
index e4d551168b7f1437ae1bc2162dfbfd5b95667150..9be6e1a7d586e2513c043c3353e384dc51ccf411 100644
(file)
--- a/
libs/ardour/solo_isolate_control.cc
+++ b/
libs/ardour/solo_isolate_control.cc
@@
-42,7
+42,7
@@
SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & na
}
void
}
void
-SoloIsolateControl::master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::
shared
_ptr<AutomationControl>)
+SoloIsolateControl::master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::
weak
_ptr<AutomationControl>)
{
if (!_soloable.can_solo()) {
return;
{
if (!_soloable.can_solo()) {
return;
@@
-84,8
+84,6
@@
SoloIsolateControl::mod_solo_isolated_by_upstream (int32_t delta)
}
if (solo_isolated() != old) {
}
if (solo_isolated() != old) {
- /* solo isolated status changed */
- _muteable.mute_master()->set_solo_ignore (solo_isolated());
Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
}
}
Changed (false, Controllable::NoGroup); /* EMIT SIGNAL */
}
}
@@
-104,7
+102,6
@@
SoloIsolateControl::actually_set_value (double val, PBD::Controllable::GroupCont
*/
AutomationControl::actually_set_value (val, gcd);
*/
AutomationControl::actually_set_value (val, gcd);
- _session.set_dirty ();
}
void
}
void
@@
-118,14
+115,12
@@
SoloIsolateControl::set_solo_isolated (bool yn, Controllable::GroupControlDispos
if (yn) {
if (_solo_isolated == false) {
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;
changed = true;
}
_solo_isolated = true;
} else {
if (_solo_isolated == true) {
_solo_isolated = false;
- _muteable.mute_master()->set_solo_ignore (false);
changed = true;
}
}
changed = true;
}
}
@@
-158,14
+153,13
@@
SoloIsolateControl::get_value () const
}
int
}
int
-SoloIsolateControl::set_state (XMLNode const & node, int)
+SoloIsolateControl::set_state (XMLNode const & node, int
version
)
{
{
- XMLProperty const * prop;
-
- if ((prop = node.property ("solo-isolated")) != 0) {
- _solo_isolated = string_is_affirmative (prop->value());
+ if (SlavableAutomationControl::set_state(node, version)) {
+ return -1;
}
}
+ node.get_property ("solo-isolated", _solo_isolated);
return 0;
}
return 0;
}
@@
-173,6
+167,6
@@
XMLNode&
SoloIsolateControl::get_state ()
{
XMLNode& node (SlavableAutomationControl::get_state());
SoloIsolateControl::get_state ()
{
XMLNode& node (SlavableAutomationControl::get_state());
- node.
add_property (X_("solo-isolated"), _solo_isolated ? X_("yes") : X_("no")
);
+ node.
set_property (X_("solo-isolated"), _solo_isolated
);
return node;
}
return node;
}