diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-25 20:46:39 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-25 20:46:39 +0000 |
commit | 8e7a5d77414a40550a28d61abf6eeb1e89a1ec25 (patch) | |
tree | 76d5851fe7221066ccadbc032a9a1fbcd1b6091b /libs/ardour/io.cc | |
parent | 94880f7cd1417031387b485e279c32eea885cf6d (diff) |
startup assistant patch from tinman; cleanup fix backported from 2.X ; easy(ier) ways to create aux sends ; facility to subgroup (route via bus) for a route group ; fix up internal send/return operation ; fix internal send naming since it doesn't need to be unique - no JACK ports involved
git-svn-id: svn://localhost/ardour2/branches/3.0@5272 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/io.cc')
-rw-r--r-- | libs/ardour/io.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index a1b1b592c5..2397999a26 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -899,19 +899,12 @@ IO::parse_gain_string (const string& str, vector<string>& ports) bool IO::set_name (const string& requested_name) { - if (requested_name == _name) { + string name = requested_name; + + if (name == _name) { return true; } - string name; - Route *rt; - if ( (rt = dynamic_cast<Route *>(this))) { - name = Route::ensure_track_or_route_name(requested_name, _session); - } else { - name = requested_name; - } - - /* replace all colons in the name. i wish we didn't have to do this */ if (replace_all (name, ":", "-")) { @@ -924,7 +917,7 @@ IO::set_name (const string& requested_name) i->set_name (current_name); } - bool const r = SessionObject::set_name(name); + bool const r = SessionObject::set_name (name); setup_bundles (); |