Always use numeric prefixes for default-named tracks / busses (#4123).

git-svn-id: svn://localhost/ardour2/branches/3.0@9762 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 3e3d391a7a595b25c2eb145ffe335fca7f358767..ecdd9bca8d5a846cdcfc8ed818b1d38c12df7e28 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1466,7 +1466,7 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m
 
        control_id = ntracks() + nbusses();
 
-       bool const use_number = (how_many != 1);
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Midi");
 
        while (how_many) {
                if (!find_route_name (name_template.empty() ? _("Midi") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
@@ -1693,7 +1693,7 @@ Session::new_audio_track (
 
        control_id = ntracks() + nbusses() + 1;
 
-       bool const use_number = (how_many != 1);
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Audio");
 
        while (how_many) {
                if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
@@ -1812,7 +1812,8 @@ Session::new_audio_route (int input_channels, int output_channels, RouteGroup* r
 
        control_id = ntracks() + nbusses() + 1;
 
-       bool const use_number = (how_many != 1);
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Bus");
+       
        while (how_many) {
                if (!find_route_name (name_template.empty () ? _("Bus") : name_template, ++bus_id, bus_name, sizeof(bus_name), use_number)) {
                        error << "cannot find name for new audio bus" << endmsg;