From e8ee8593c7b5c3d801d63cbd955e9b6c1c35bdcd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 Nov 2011 19:29:48 +0000 Subject: [PATCH] Trim function that is only used once. git-svn-id: svn://localhost/ardour2/branches/3.0@10804 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/plugin_insert.h | 1 - libs/ardour/plugin_insert.cc | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index 0e530c5d8e..b7a89b663f 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -186,7 +186,6 @@ class PluginInsert : public Processor void set_control_ids (const XMLNode&, int version); boost::shared_ptr plugin_factory (boost::shared_ptr); - void add_plugin_with_activation (boost::shared_ptr); void add_plugin (boost::shared_ptr); }; diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index aae9278e93..b7c338aa20 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -94,7 +94,11 @@ PluginInsert::set_count (uint32_t num) uint32_t diff = num - _plugins.size(); for (uint32_t n = 0; n < diff; ++n) { - add_plugin_with_activation (plugin_factory (_plugins[0])); + boost::shared_ptr p = plugin_factory (_plugins[0]); + add_plugin (p); + if (active ()) { + p->activate (); + } if (require_state) { /* XXX do something */ @@ -1272,17 +1276,6 @@ PluginInsert::collect_signal_for_analysis (framecnt_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->set_insert_info (this); - _plugins.push_back (plugin); - if (active()) { - plugin->activate (); - } -} - /** Add a plugin to our list */ void PluginInsert::add_plugin (boost::shared_ptr plugin)