ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

When renaming a track to the name of an existing one, 

use the same behaviour in both the editor and mixer
windows (add a number to the requested name).


git-svn-id: svn://localhost/ardour2/branches/3.0@9954 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-08-03 13:28:54 +00:00
parent 61d95b0bd0
commit 89354edbbc
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/route_time_axis.cc
View File

@ -1299,35 +1299,27 @@ RouteTimeAxisView::playlist () const
void
RouteTimeAxisView::name_entry_changed ()
{
string x;
x = name_entry.get_text ();
string x = name_entry.get_text ();
if (x == _route->name()) {
return;
}
strip_whitespace_edges(x);
strip_whitespace_edges (x);
if (x.length() == 0) {
name_entry.set_text (_route->name());
return;
}
if (!_session->route_name_unique (x)) {
ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
name_entry.set_text (_route->name());
} else if (_session->route_name_internal (x)) {
if (_session->route_name_internal (x)) {
ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
PROGRAM_NAME));
name_entry.set_text (_route->name());
PROGRAM_NAME));
name_entry.grab_focus ();
} else if (RouteUI::verify_new_route_name (x)) {
_route->set_name (x);
} else {
if (RouteUI::verify_new_route_name (x)) {
_route->set_name (x);
} else {
name_entry.grab_focus ();
}
name_entry.grab_focus ();
}
}