smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Revert completely mystifying stupidity in a previous patch of mine, and (properly) fix crashes when drag-and-drop of plugins fails because of impossible configurations.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6237 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-12-01 02:36:31 +00:00
parent e374518ca9
commit 4ee4be1550
1 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/route.cc
View file

@ -985,8 +985,6 @@ Route::add_processors (const ProcessorList& others, ProcessorList::iterator iter
{ {
Glib::RWLock::WriterLock lm (_processor_lock); Glib::RWLock::WriterLock lm (_processor_lock);
ProcessorList::iterator existing_end = _processors.end();
--existing_end;
ChanCount potential_max_streams = ChanCount::max (_input->n_ports(), _output->n_ports()); ChanCount potential_max_streams = ChanCount::max (_input->n_ports(), _output->n_ports());
@ -1012,15 +1010,14 @@ Route::add_processors (const ProcessorList& others, ProcessorList::iterator iter
} }
} }
_processors.insert (iter, *i); ProcessorList::iterator inserted = _processors.insert (iter, *i);
if ((*i)->active()) { if ((*i)->active()) {
(*i)->activate (); (*i)->activate ();
} }
if (configure_processors_unlocked (err)) { if (configure_processors_unlocked (err)) {
++existing_end; _processors.erase (inserted);
_processors.erase (existing_end, _processors.end());
configure_processors_unlocked (0); // it worked before we tried to add it ... configure_processors_unlocked (0); // it worked before we tried to add it ...
return -1; return -1;
} }
@ -1473,15 +1470,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
} }
} }
/* Take the process lock so that if we add a processor which increases the required
number of scratch buffers, we create those scratch buffers before the process
thread has a chance to ask for them.
XXX: in an ideal world we'd perhaps use some RCU magic to avoid having to take
the lock here.
*/
Glib::Mutex::Lock pl (_session.engine().process_lock ());
// We can, so configure everything // We can, so configure everything
list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin(); list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin();
for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) { for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) {