projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0fd2d82
)
save/restore track monitoring, rec-enable and rec-safe states
author
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 19 Jul 2016 22:56:31 +0000
(18:56 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 19 Jul 2016 22:56:37 +0000
(18:56 -0400)
libs/ardour/track.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/track.cc
b/libs/ardour/track.cc
index 062f1601c4ee23ad1d7a58cf7397ec67ae4f3871..02c44eddf7dcb46b52b6599121949d8736a44fa3 100644
(file)
--- a/
libs/ardour/track.cc
+++ b/
libs/ardour/track.cc
@@
-105,6
+105,11
@@
XMLNode&
Track::state (bool full)
{
XMLNode& root (Route::state (full));
Track::state (bool full)
{
XMLNode& root (Route::state (full));
+
+ root.add_child_nocopy (_monitoring_control->get_state ());
+ root.add_child_nocopy (_record_safe_control->get_state ());
+ root.add_child_nocopy (_record_enable_control->get_state ());
+
root.add_property (X_("saved-meter-point"), enum_2_string (_saved_meter_point));
root.add_child_nocopy (_diskstream->get_state ());
root.add_property (X_("saved-meter-point"), enum_2_string (_saved_meter_point));
root.add_child_nocopy (_diskstream->get_state ());
@@
-141,9
+146,18
@@
Track::set_state (const XMLNode& node, int version)
child = *niter;
XMLProperty const * prop;
child = *niter;
XMLProperty const * prop;
- if (child->name() == Controllable::xml_node_name && (prop = child->property ("name")) != 0) {
- if (prop->value() == X_("recenable")) {
+
+ if (child->name() == Controllable::xml_node_name) {
+ if ((prop = child->property ("name")) == 0) {
+ continue;
+ }
+
+ if (prop->value() == _record_enable_control->name()) {
_record_enable_control->set_state (*child, version);
_record_enable_control->set_state (*child, version);
+ } else if (prop->value() == _record_safe_control->name()) {
+ _record_safe_control->set_state (*child, version);
+ } else if (prop->value() == _monitoring_control->name()) {
+ _monitoring_control->set_state (*child, version);
}
}
}
}
}
}