From 23efc699c320c26a67d600179646cf1f210f89c0 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 21 Apr 2017 10:26:59 +0200 Subject: [PATCH] Do not clear pretty-names set by the backend Since 7dde6c3b8f pretty-names are no longer saved and hence initially empty. The port-manager cleared existing pretty-port-names. --- libs/ardour/port_manager.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index f4e920639f..9529093edf 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -1192,6 +1192,12 @@ PortManager::fill_midi_port_info_locked () * PortManager */ + // rg: I don't understand what this attempts to solve + // + // Naming ports should be left to the backend: + // Ardour cannot associate numeric IDs with corresponding hardware. + // (see also 7dde6c3b) + for (MidiPortInfo::iterator x = midi_port_info.begin(); x != midi_port_info.end(); ++x) { PortEngine::PortHandle ph = _backend->get_port_by_name (x->first); @@ -1203,7 +1209,7 @@ PortManager::fill_midi_port_info_locked () continue; } - if (x->second.pretty_name != x->first) { + if (!x->second.pretty_name.empty () && x->second.pretty_name != x->first) { /* name set in port info ... propagate */ _backend->set_port_property (ph, "http://jackaudio.org/metadata/pretty-name", x->second.pretty_name, string()); } else {