From af29e7483bcdccc764444582b4ddfb80d8f50a0a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 8 Jan 2021 16:30:57 +0100 Subject: [PATCH] VKeybd: use a non-translatable port-name (1/2) This improves session portability, only the "pretty name" should be visible to the user. --- libs/ardour/globals.cc | 8 ++++---- libs/ardour/midiport_manager.cc | 3 ++- libs/ardour/port_manager.cc | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 4a46fdb643..5d189b97fe 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -610,10 +610,10 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir while for pure I/O (e.g. "Click") track/bus creation must always fail. */ - reserved_io_names[_("Monitor")] = true; - reserved_io_names[_("Master")] = true; - reserved_io_names[X_("auditioner")] = true; // auditioner.cc Track (s, "auditioner",...) - reserved_io_names[_("Virtual Keyboard")] = false; + reserved_io_names[_("Monitor")] = true; + reserved_io_names[_("Master")] = true; + reserved_io_names[X_("auditioner")] = true; // auditioner.cc Track (s, "auditioner",...) + reserved_io_names[X_("x-virtual-keyboard")] = false; /* pure I/O */ reserved_io_names[X_("Click")] = false; // session.cc ClickIO (*this, X_("Click") diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc index c204e7d6e1..b29c520d7a 100644 --- a/libs/ardour/midiport_manager.cc +++ b/libs/ardour/midiport_manager.cc @@ -68,8 +68,9 @@ MidiPortManager::create_ports () _scene_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("Scene in"), true); _scene_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("Scene out"), true); - _vkbd_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("Virtual Keyboard"), true); + _vkbd_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("x-virtual-keyboard"), true); boost::dynamic_pointer_cast(_vkbd_out)->set_flush_at_cycle_start (true); + _vkbd_out->set_pretty_name (_("Virtual Keyboard")); /* Now register ports used to send positional sync data (MTC and MIDI Clock) */ diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index 537fda4152..02da3b219d 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -1270,8 +1270,8 @@ PortManager::fill_midi_port_info_locked () for (vector::iterator p = ports.begin(); p != ports.end(); ++p) { - /* ugly hack, ideally we'd use a port-flag, or at vkbd_output_port()->name() */ - if (port_is_mine (*p) && *p != _backend->my_name() + ":" + _("Virtual Keyboard")) { + /* ugly hack, ideally we'd use a port-flag, or vkbd_output_port()->name() */ + if (port_is_mine (*p) && *p != _backend->my_name() + ":x-virtual-keyboard") { continue; } @@ -1281,7 +1281,7 @@ PortManager::fill_midi_port_info_locked () if (port_is_control_only (*p)) { flags = MidiPortControl; - } else if (*p == _backend->my_name() + ":" + _("Virtual Keyboard")) { + } else if (*p == _backend->my_name() + ":x-virtual-keyboard") { flags = MidiPortFlags(MidiPortSelection | MidiPortMusic); }