Use session-version when loading processor state
Stateful::loading_state_version vs.
Stateful::current_state_version
See also 0a5837ec71
This commit is contained in:
parent
d72b44b5a4
commit
cfea85b496
@ -2998,41 +2998,41 @@ Route::set_processor_state (const XMLNode& node, int version)
|
|||||||
XMLProperty* prop = (*niter)->property ("type");
|
XMLProperty* prop = (*niter)->property ("type");
|
||||||
|
|
||||||
if (prop->value() == "amp") {
|
if (prop->value() == "amp") {
|
||||||
_amp->set_state (**niter, Stateful::current_state_version);
|
_amp->set_state (**niter, version);
|
||||||
new_order.push_back (_amp);
|
new_order.push_back (_amp);
|
||||||
} else if (prop->value() == "trim") {
|
} else if (prop->value() == "trim") {
|
||||||
_trim->set_state (**niter, Stateful::current_state_version);
|
_trim->set_state (**niter, version);
|
||||||
new_order.push_back (_trim);
|
new_order.push_back (_trim);
|
||||||
} else if (prop->value() == "meter") {
|
} else if (prop->value() == "meter") {
|
||||||
_meter->set_state (**niter, Stateful::current_state_version);
|
_meter->set_state (**niter, version);
|
||||||
new_order.push_back (_meter);
|
new_order.push_back (_meter);
|
||||||
} else if (prop->value() == "polarity") {
|
} else if (prop->value() == "polarity") {
|
||||||
_polarity->set_state (**niter, Stateful::current_state_version);
|
_polarity->set_state (**niter, version);
|
||||||
new_order.push_back (_polarity);
|
new_order.push_back (_polarity);
|
||||||
} else if (prop->value() == "delay") {
|
} else if (prop->value() == "delay") {
|
||||||
// skip -- internal
|
// skip -- internal
|
||||||
} else if (prop->value() == "main-outs") {
|
} else if (prop->value() == "main-outs") {
|
||||||
_main_outs->set_state (**niter, Stateful::current_state_version);
|
_main_outs->set_state (**niter, version);
|
||||||
} else if (prop->value() == "intreturn") {
|
} else if (prop->value() == "intreturn") {
|
||||||
if (!_intreturn) {
|
if (!_intreturn) {
|
||||||
_intreturn.reset (new InternalReturn (_session));
|
_intreturn.reset (new InternalReturn (_session));
|
||||||
must_configure = true;
|
must_configure = true;
|
||||||
}
|
}
|
||||||
_intreturn->set_state (**niter, Stateful::current_state_version);
|
_intreturn->set_state (**niter, version);
|
||||||
} else if (is_monitor() && prop->value() == "monitor") {
|
} else if (is_monitor() && prop->value() == "monitor") {
|
||||||
if (!_monitor_control) {
|
if (!_monitor_control) {
|
||||||
_monitor_control.reset (new MonitorProcessor (_session));
|
_monitor_control.reset (new MonitorProcessor (_session));
|
||||||
must_configure = true;
|
must_configure = true;
|
||||||
}
|
}
|
||||||
_monitor_control->set_state (**niter, Stateful::current_state_version);
|
_monitor_control->set_state (**niter, version);
|
||||||
} else if (prop->value() == "capture") {
|
} else if (prop->value() == "capture") {
|
||||||
/* CapturingProcessor should never be restored, it's always
|
/* CapturingProcessor should never be restored, it's always
|
||||||
added explicitly when needed */
|
added explicitly when needed */
|
||||||
} else if (prop->value() == "diskreader" && _disk_reader) {
|
} else if (prop->value() == "diskreader" && _disk_reader) {
|
||||||
_disk_reader->set_state (**niter, Stateful::current_state_version);
|
_disk_reader->set_state (**niter, version);
|
||||||
new_order.push_back (_disk_reader);
|
new_order.push_back (_disk_reader);
|
||||||
} else if (prop->value() == "diskwriter" && _disk_writer) {
|
} else if (prop->value() == "diskwriter" && _disk_writer) {
|
||||||
_disk_writer->set_state (**niter, Stateful::current_state_version);
|
_disk_writer->set_state (**niter, version);
|
||||||
new_order.push_back (_disk_writer);
|
new_order.push_back (_disk_writer);
|
||||||
} else {
|
} else {
|
||||||
set_processor_state (**niter, version, prop, new_order, must_configure);
|
set_processor_state (**niter, version, prop, new_order, must_configure);
|
||||||
|
Loading…
Reference in New Issue
Block a user