tweaks to NO_PLUGIN_STATE logic

This commit is contained in:
Paul Davis
2013-07-15 20:04:37 -04:00
parent e3978edabb
commit 25cbd8fb40
2 changed files with 14 additions and 10 deletions

View File

@@ -395,7 +395,7 @@ Plugin::get_state ()
add_state (root);
#else
if (!seen_get_state_message) {
info << string_compose (_("Saving AudioUnit settings is not supported in this build of %1. Consider paying for a newer version"),
info << string_compose (_("Saving plugin settings is not supported in this build of %1. Consider paying for the full version"),
PROGRAM_NAME)
<< endmsg;
seen_get_state_message = true;

View File

@@ -2558,21 +2558,25 @@ Route::set_processor_state (const XMLNode& node)
continue;
}
#ifndef NO_PLUGIN_STATE
if (processor->set_state (**niter, Stateful::current_state_version) != 0) {
/* This processor could not be configured. Turn it into a UnknownProcessor */
processor.reset (new UnknownProcessor (_session, **niter));
}
#else
if (boost::dynamic_pointer_cast<PluginInsert>(processor)) {
#ifndef NO_PLUGIN_STATE
if (processor->set_state (**niter, Stateful::current_state_version) != 0) {
/* This processor could not be configured. Turn it into a UnknownProcessor */
processor.reset (new UnknownProcessor (_session, **niter));
}
} else {
/* plugin, but ::set_state() not * allowed no message here - things will get too verbose */
}
#else
/* plugin, with NO_PLUGIN_STATE defined
* =>::set_state() not allowed. Do not
* display a message here - things will
* get too verbose.
*/
#endif
} else {
if (processor->set_state (**niter, Stateful::current_state_version) != 0) {
/* This processor could not be configured. Turn it into a UnknownProcessor */
processor.reset (new UnknownProcessor (_session, **niter));
}
}
/* we have to note the monitor send here, otherwise a new one will be created
and the state of this one will be lost.