projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repeat INSENSITIVE colors instead of relying on inheritance
[ardour.git]
/
libs
/
ardour
/
track.cc
diff --git
a/libs/ardour/track.cc
b/libs/ardour/track.cc
index 71eabc5b2845ac8ed20d4e1f726bde3dd4b50ede..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);
}
}
}
}
}
}
@@
-466,12
+480,7
@@
Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
passthru (bufs, start_frame, end_frame, nframes, false);
}
passthru (bufs, start_frame, end_frame, nframes, false);
}
- for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
- boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
- if (d) {
- d->flush_buffers (nframes);
- }
- }
+ flush_processor_buffers_locked (nframes);
return 0;
}
return 0;
}
@@
-501,6
+510,7
@@
Track::silent_roll (pframes_t nframes, framepos_t /*start_frame*/, framepos_t /*
_amp->apply_gain_automation(false);
silence (nframes);
_amp->apply_gain_automation(false);
silence (nframes);
+ flush_processor_buffers_locked (nframes);
framecnt_t playback_distance;
framecnt_t playback_distance;