ardour/livetrax
13
0
Fork 0
Code

Activate plugins that are added to a PluginInsert after it itself has been activated.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7736 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-09-02 19:11:02 +00:00
parent ade3609b01
commit 0c496aafed
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/plugin_insert.h
View File

@ -140,6 +140,7 @@ class PluginInsert : public Processor
int32_t count_for_configuration (ChanCount in, ChanCount out) const;
boost::shared_ptr<Plugin> plugin_factory (boost::shared_ptr<Plugin>);
void add_plugin_with_activation (boost::shared_ptr<Plugin>);
};
} // namespace ARDOUR

3
libs/ardour/ladspa_plugin.cc
View File

@ -634,6 +634,9 @@ LadspaPlugin::run_in_place (nframes_t nframes)
_control_data[i] = _shadow_data[i];
}
}
assert (_was_activated);
_descriptor->run (_handle, nframes);
}

15
libs/ardour/plugin_insert.cc
View File

@ -92,7 +92,7 @@ PluginInsert::set_count (uint32_t num)
uint32_t diff = num - _plugins.size();
for (uint32_t n = 0; n < diff; ++n) {
_plugins.push_back (plugin_factory (_plugins[0]));
add_plugin_with_activation (_plugins[0]);
if (require_state) {
/* XXX do something */
@ -762,10 +762,10 @@ PluginInsert::set_state(const XMLNode& node, int version)
if (_plugins.size() != count) {
_plugins.push_back (plugin);
add_plugin_with_activation (plugin);
for (uint32_t n = 1; n < count; ++n) {
_plugins.push_back (plugin_factory (plugin));
add_plugin_with_activation (plugin_factory (plugin));
}
}
@ -1003,3 +1003,12 @@ PluginInsert::collect_signal_for_analysis(nframes_t nframes)
_signal_analysis_collect_nframes_max = nframes;
}
/** Add a plugin to our list and activate it if we have already been activated */
void
PluginInsert::add_plugin_with_activation (boost::shared_ptr<Plugin> plugin)
{
_plugins.push_back (plugin);
if (active()) {
plugin->activate ();
}
}