allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9351 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2011-04-15 00:28:29 +00:00
parent 852232ad27
commit 1cc5a1829b
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/processor_box.cc
View File

@@ -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?

2
libs/ardour/ardour/route.h
View File

@@ -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);

4
libs/ardour/route.cc
View File

@@ -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);
}