diff options
| author | Sampo Savolainen <v2@iki.fi> | 2007-04-07 13:41:27 +0000 |
|---|---|---|
| committer | Sampo Savolainen <v2@iki.fi> | 2007-04-07 13:41:27 +0000 |
| commit | 1153498bd1a8d754fcccc65fe3a7096457117141 (patch) | |
| tree | 496c85a797668d0f66e13f69b44ab7945c862b7a | |
| parent | 98cfa3a504ba063e82692b6c85293cabf5c9d866 (diff) | |
Start bus numbering in new sessions from 1 while making sure no
duplicate names are attempted.
git-svn-id: svn://localhost/ardour2/trunk@1678 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/session.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b496afe9d6..fa8d0d4719 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1853,7 +1853,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_ for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { if (dynamic_cast<AudioTrack*>((*i).get()) == 0) { - if (!(*i)->hidden()) { + if (!(*i)->hidden() && (*i)->name() != "master") { bus_id++; } } @@ -1870,15 +1870,13 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_ while (how_many) { do { - ++bus_id; - snprintf (bus_name, sizeof(bus_name), "Bus %" PRIu32, bus_id); if (route_by_name (bus_name) == 0) { break; } - } while (bus_id < (UINT_MAX-1)); + } while (++bus_id < (UINT_MAX-1)); try { shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO)); |