ardour/livetrax
13
0
Fork 0
Code

rename only the main outs of a route when its name changes, not inserts or sends, which leads to port name collisions since the name gets shared with the route itself

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9333 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-04-08 16:48:34 +00:00
parent 33cd347529
commit ce35e913d0
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/ardour/route.cc
View File

@ -3271,22 +3271,20 @@ Route::set_name (const string& str)
ret = (_input->set_name(name) && _output->set_name(name)); ret = (_input->set_name(name) && _output->set_name(name));
if (ret) { if (ret) {
/* rename the main outs. Leave other IO processors
* with whatever name they already have, because its
* just fine as it is (it will not contain the route
* name if its a port insert, port send or port return).
*/
Glib::RWLock::ReaderLock lm (_processor_lock); if (_main_outs) {
if (_main_outs->set_name (name)) {
for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { /* XXX returning false here is stupid because
we already changed the route name.
/* rename all I/O processors that have inputs or outputs */ */
return false;
boost::shared_ptr<IOProcessor> iop = boost::dynamic_pointer_cast<IOProcessor> (*i);
if (iop && (iop->output() || iop->input())) {
if (!iop->set_name (name)) {
ret = false;
}
} }
} }
} }
return ret; return ret;