ardour/livetrax
13
0
Fork 0
Code

use PortManager::port_name_prefix_is_unique to check for new route names

Browse Source
This commit is contained in:
Paul Davis 2015-09-10 16:27:14 -04:00
parent c7e755b25c
commit bfd66b2ea0
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/ardour/session.cc
View File

@ -2198,14 +2198,37 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
bool
Session::find_route_name (string const & base, uint32_t& id, string& name, bool definitely_add_number)
{
if (!definitely_add_number && route_by_name (base) == 0) {
string el_base = base;
/* the base may conflict with ports that do not belong to existing
routes, but hidden objects like the click track. So check port names
before anything else.
*/
if (!_engine.port_name_prefix_is_unique (base)) {
uint32_t unique_port_suffix = 1;
do {
string possible = string_compose (X_("%1-%2"), base, unique_port_suffix);
if (_engine.port_name_prefix_is_unique (possible)) {
el_base = possible;
break;
}
unique_port_suffix++;
} while (unique_port_suffix < UINT_MAX);
}
if (!definitely_add_number && route_by_name (el_base) == 0) {
/* juse use the base */
name = base;
name = el_base;
return true;
}
do {
name = string_compose ("%1 %2", base, id);
name = string_compose ("%1 %2", el_base, id);
if (route_by_name (name) == 0) {
return true;