summaryrefslogtreecommitdiff
path: root/gtk2_ardour/route_time_axis.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-07-26 02:07:59 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-07-26 02:07:59 +0000
commitdf78f284ee2707154cd56b2b25340f2fe8a8b6d2 (patch)
treeba23556f15cfecc1b358f4f1df611989c609bc62 /gtk2_ardour/route_time_axis.cc
parentfd384bf48e71b65ccd3858d10cc390c4128c469c (diff)
fix up colons in track names before they are used for JACK port names; catch most (not all) attempted renames and ask the user about colons
git-svn-id: svn://localhost/ardour2/branches/3.0@9928 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
-rw-r--r--gtk2_ardour/route_time_axis.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 85601362c8..3836f4cf6c 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -195,7 +195,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
rec_enable_button->set_sensitive (_session->writable());
}
-
+
controls_hbox.pack_start(gm.get_level_meter(), false, false);
_route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
_route->input()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
@@ -1322,7 +1322,10 @@ RouteTimeAxisView::name_entry_changed ()
PROGRAM_NAME));
name_entry.set_text (_route->name());
} else {
- _route->set_name (x);
+
+ if (RouteUI::verify_new_route_name (x)) {
+ _route->set_name (x);
+ }
}
}