From 3495fe2038dfba4a6ca91e9e8806f48d420ec6ba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Feb 2011 16:43:39 +0000 Subject: [PATCH] Fix thinko with numbering of multiple added tracks. git-svn-id: svn://localhost/ardour2/branches/3.0@8979 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/session.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 52123c18f1..b6b238a398 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1486,8 +1486,9 @@ Session::new_midi_track (TrackMode mode, RouteGroup* route_group, uint32_t how_m control_id = ntracks() + nbusses(); + bool const use_number = (how_many != 1); + while (how_many) { - bool const use_number = (how_many != 1); if (!find_route_name (name_template.empty() ? _("Midi") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) { error << "cannot find name for new midi track" << endmsg; goto failed; @@ -1659,8 +1660,9 @@ Session::new_audio_track ( control_id = ntracks() + nbusses() + 1; + bool const use_number = (how_many != 1); + while (how_many) { - bool const use_number = (how_many != 1); if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) { error << "cannot find name for new audio track" << endmsg; goto failed; @@ -1783,8 +1785,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); while (how_many) { - bool const use_number = (how_many != 1); 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; goto failure;