diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-04-15 00:28:29 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-04-15 00:28:29 +0000 |
| commit | 1cc5a1829bd2b2fcee956b76d8065bfb68c1adc3 (patch) | |
| tree | 2c7cdeccae488c4b4ab066ccd71ddf1b01ebf870 | |
| parent | 852232ad279b1436d3fd075a745c262334c172f8 (diff) | |
Fix 'make new plugins active' configure option (#3975).
git-svn-id: svn://localhost/ardour2/branches/3.0@9351 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 064e7358fd..ff1c05e18a 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -921,11 +921,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) Route::ProcessorStreams err_streams; - if (Config->get_new_plugins_active()) { - processor->activate (); - } - - if (_route->add_processor (processor, _placement, &err_streams)) { + if (_route->add_processor (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { weird_plugin_dialog (**p, err_streams); return true; // XXX SHAREDPTR delete plugin here .. do we even need to care? diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index ce777171b8..8f2baa18f9 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -235,7 +235,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, ChanCount count; ///< Input requested of processor }; - int add_processor (boost::shared_ptr<Processor>, Placement placement, ProcessorStreams* err = 0); + int add_processor (boost::shared_ptr<Processor>, Placement placement, ProcessorStreams* err = 0, bool activation_allowed = true); int add_processor (boost::shared_ptr<Processor>, ProcessorList::iterator iter, ProcessorStreams* err = 0, bool activation_allowed = true); int add_processors (const ProcessorList&, boost::shared_ptr<Processor> before, ProcessorStreams* err = 0); int remove_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0); diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 04100f6203..1ea43e4a64 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -826,7 +826,7 @@ dump_processors(const string& name, const list<boost::shared_ptr<Processor> >& p #endif int -Route::add_processor (boost::shared_ptr<Processor> processor, Placement placement, ProcessorStreams* err) +Route::add_processor (boost::shared_ptr<Processor> processor, Placement placement, ProcessorStreams* err, bool activation_allowed) { ProcessorList::iterator loc; @@ -842,7 +842,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, Placement placemen loc = find (_processors.begin(), _processors.end(), _main_outs); } - return add_processor (processor, loc, err); + return add_processor (processor, loc, err, activation_allowed); } |