ardour/livetrax
13
0
Fork 0
Code

cleaner version of 7383ea6a (duplicate plugin state)

Browse Source
This commit is contained in:
Robin Gareus 2015-12-18 14:55:33 +01:00
parent 3eb04c3c23
commit 6e7ce525f7
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/ardour/plugin_insert.cc
View File

@ -1113,20 +1113,15 @@ PluginInsert::set_state(const XMLNode& node, int version)
}
}
PBD::ID this_id = this->id();
if (regenerate_xml_or_string_ids ()) {
/* when duplicating a track, we need to use the
* original ID for loading plugin state (from file)
*/
const XMLProperty* prop;
if ((prop = node.property ("id")) != 0) {
plugin->set_insert_id (prop->value ());
}
}
Processor::set_state (node, version);
PBD::ID new_id = this->id();
PBD::ID old_id = this->id();
if ((prop = node.property ("id")) != 0) {
old_id = prop->value ();
}
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
/* find the node with the type-specific node name ("lv2", "ladspa", etc)
@ -1136,12 +1131,26 @@ PluginInsert::set_state(const XMLNode& node, int version)
if ((*niter)->name() == plugin->state_node_name()) {
for (Plugins::iterator i = _plugins.begin(); i != _plugins.end(); ++i) {
/* Plugin state can include external files which are named after the ID.
*
* If regenerate_xml_or_string_ids() is set, the ID will already have
* been changed, so we need to use the old ID from the XML to load the
* state and then update the ID.
*
* When copying a plugin-state, route_ui takes care of of updating the ID,
* but we need to call set_insert_id() to clear the cached plugin-state
* and force a change.
*/
if (!regenerate_xml_or_string_ids ()) {
(*i)->set_insert_id (this->id());
(*i)->set_insert_id (new_id);
} else {
(*i)->set_insert_id (old_id);
}
(*i)->set_state (**niter, version);
if (regenerate_xml_or_string_ids ()) {
(*i)->set_insert_id (this_id);
(*i)->set_insert_id (new_id);
}
}
@ -1149,10 +1158,6 @@ PluginInsert::set_state(const XMLNode& node, int version)
}
}
if (regenerate_xml_or_string_ids ()) {
plugin->set_insert_id (this_id);
}
if (version < 3000) {
/* Only 2.X sessions need a call to set_parameter_state() - in 3.X and above