Fix 'make new plugins active' configure option (#3975).

git-svn-id: svn://localhost/ardour2/branches/3.0@9351 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 064e7358fdd25ee8ec38db750b6f660231f01aa8..ff1c05e18a2417272185b96b06629f557d6e85ba 100644 (file)
--- 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 ce777171b896dbe223fbb1435f8f512614901f9b..8f2baa18f94dba3302a698fbb41a995d013c4c28 100644 (file)
--- 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 04100f620353ec8808d8de4965bf7bbfb08d2bd0..1ea43e4a64c99cc4c61d613dc52b44771dea2292 100644 (file)
--- 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);
 }