diff options
| author | Robin Gareus <robin@gareus.org> | 2017-04-21 10:26:59 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-04-21 10:26:59 +0200 |
| commit | 23efc699c320c26a67d600179646cf1f210f89c0 (patch) | |
| tree | 1a9e9ae540784a4cab59622834d2e6cd2c88cc4b /libs/ardour/port_manager.cc | |
| parent | 10c489153262467c9435c48b141196b5a74dfa97 (diff) | |
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.
Diffstat (limited to 'libs/ardour/port_manager.cc')
| -rw-r--r-- | libs/ardour/port_manager.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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 { |