From d13fdaa9d19e0db68ddcc792c3c3bb8ff661a72e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 23 Jun 2009 20:02:15 +0000 Subject: make RouteGroup gain control work again ; fix what solo button label shows under different conditions; other miscellania git-svn-id: svn://localhost/ardour2/branches/3.0@5262 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/port.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'libs/ardour/port.cc') diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index ebe31a1fde..247357d16b 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -238,15 +238,20 @@ Port::reconnect () return 0; } -/** @param n Short name */ +/** @param n Short or long name */ int Port::set_name (std::string const & n) { - assert (_name.find_first_of (':') == std::string::npos); + if (n == _name) { + return 0; + } + + string const s = _engine->make_port_name_non_relative (n); + + int const r = jack_port_set_name (_jack_port, s.c_str()); - int const r = jack_port_set_name (_jack_port, n.c_str()); if (r == 0) { - _name = n; + _name = n; // short form, probably } return r; -- cgit v1.2.3