smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-10 15:36:24 +01:00
Code Issues Projects Releases Wiki Activity

fix import of v2 session redirects: active or inactive

Browse source
This commit is contained in:
Ben Loftis 2015-03-05 12:48:30 -06:00
parent 1089f19a4c
commit 5bf90524df
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/processor.cc
View file

@ -150,7 +150,9 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
set_id (**i);
if ((prop = (*i)->property ("active")) != 0) {
//note: in A2, active state was stored in the Redirect node, not the child IO node
/*
* if ((prop = (*i)->property ("active")) != 0) {
bool const a = string_is_affirmative (prop->value ());
if (_active != a) {
if (a) {
@ -159,7 +161,8 @@ Processor::set_state_2X (const XMLNode & node, int /*version*/)
deactivate ();
}
}
}
}*/
}
}

12
libs/ardour/route.cc
View file

@ -1217,8 +1217,18 @@ Route::add_processor_from_xml_2X (const XMLNode& node, int version)
if (processor->set_state (node, version)) {
return false;
}
//A2 uses the "active" flag in the toplevel redirect node, not in the child plugin/IO
if (i != children.end()) {
if ((prop = (*i)->property (X_("active"))) != 0) {
if ( string_is_affirmative (prop->value()) )
processor->activate();
else
processor->deactivate();
}
}
return (add_processor (processor, placement) == 0);
return (add_processor (processor, placement, 0, false) == 0);
}
catch (failed_constructor &err) {