From 08910b2783c39987d8476716f25b620e1eac0c10 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Jun 2011 23:37:02 +0000 Subject: [PATCH] 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 --- libs/ardour/session.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 3e3d391a7a..ecdd9bca8d 100644 --- 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;