From 332deec1553ceabd6716af9797a965a80ad9dfed Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 15 Jul 2013 20:04:37 -0400 Subject: tweaks to NO_PLUGIN_STATE logic --- libs/ardour/plugin.cc | 2 +- libs/ardour/route.cc | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'libs') diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index e76353e8d5..9b2170c349 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -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; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index e87cb4b03f..9d7dc8792b 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -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(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, with NO_PLUGIN_STATE defined + * =>::set_state() not allowed. Do not + * display a message here - things will + * get too verbose. + */ +#endif } else { - /* plugin, but ::set_state() not * allowed no message here - things will get too verbose */ + 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)); + } } -#endif /* we have to note the monitor send here, otherwise a new one will be created and the state of this one will be lost. -- cgit v1.2.3