projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch from std::auto_ptr<> (deprecated) to boost::scoped_ptr<>
[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 c2d7f13d2cd8c0ced51853073d4f80a0402b1351..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;
@@
-159,12
+159,7
@@
SoloIsolateControl::set_state (XMLNode const & node, int version)
return -1;
}
return -1;
}
- XMLProperty const * prop;
-
- if ((prop = node.property ("solo-isolated")) != 0) {
- _solo_isolated = string_is_affirmative (prop->value());
- }
-
+ node.get_property ("solo-isolated", _solo_isolated);
return 0;
}
return 0;
}
@@
-172,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;
}