summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-04-29 16:15:33 +0000
committerCarl Hetherington <carl@carlh.net>2009-04-29 16:15:33 +0000
commit7eba373a0f9e48f8f68ac613021748e08f42ec4d (patch)
tree647ed60993e1b9a9e20bfed7bbeb60b5d96ceb48 /libs
parentb28bc3b43e1873b46396f0e42aad5921f7f900d4 (diff)
Disallow click and auditioner as track / buss names to avoid clashing with internal IOs.
git-svn-id: svn://localhost/ardour2/branches/3.0@5009 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/session.h1
-rw-r--r--libs/ardour/session.cc14
2 files changed, 15 insertions, 0 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index c2e7e23476..ce29928468 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -332,6 +332,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
boost::shared_ptr<Route> route_by_remote_id (uint32_t id);
bool route_name_unique (string) const;
+ bool route_name_internal (string) const;
bool get_record_enabled() const {
return (record_status () >= Enabled);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index e2e38a17c5..fdb396d902 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -4002,6 +4002,20 @@ Session::route_name_unique (string n) const
return true;
}
+bool
+Session::route_name_internal (string n) const
+{
+ if (auditioner && auditioner->name() == n) {
+ return true;
+ }
+
+ if (_click_io && _click_io->name() == n) {
+ return true;
+ }
+
+ return false;
+}
+
uint32_t
Session::n_playlists () const
{