diff options
author | Robin Gareus <robin@gareus.org> | 2013-10-23 18:02:49 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-10-23 19:59:26 +0200 |
commit | da1a9bbade7adf359a5448daaba929b91b112e9c (patch) | |
tree | c037041192463226ee72cbb42a2a7ec7dcc2bb9c /libs | |
parent | 20c20b7ddfbbc5bf9888f39f41d6c243534cc94f (diff) |
make fixed IO ports untranslatable
Outdated and fuzzy translations of MTC, MTC, LTC, etc caused
various issues (duplicate jack port names, exceptions, crashes).
Functionality should not be affected by translations (for now).
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/midiport_manager.cc | 16 | ||||
-rw-r--r-- | libs/ardour/session.cc | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc index d17401cee8..6de0436586 100644 --- a/libs/ardour/midiport_manager.cc +++ b/libs/ardour/midiport_manager.cc @@ -68,11 +68,11 @@ MidiPortManager::create_ports () return; } - _midi_in = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MIDI control in"), true); - _midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MIDI control out"), true); + _midi_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI control in"), true); + _midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI control out"), true); - _mmc_in = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MMC in"), true); - _mmc_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MMC out"), true); + _mmc_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MMC in"), true); + _mmc_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MMC out"), true); /* XXX nasty type conversion needed because of the mixed inheritance * required to integrate MIDI::IPMidiPort and ARDOUR::AsyncMIDIPort. @@ -93,14 +93,14 @@ MidiPortManager::create_ports () boost::shared_ptr<ARDOUR::Port> p; - p = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MTC in")); + p = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MTC in")); _mtc_input_port = boost::dynamic_pointer_cast<MidiPort> (p); - p = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MTC out")); + p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MTC out")); _mtc_output_port= boost::dynamic_pointer_cast<MidiPort> (p); - p = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MIDI Clock in")); + p = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI Clock in")); _midi_clock_input_port = boost::dynamic_pointer_cast<MidiPort> (p); - p = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MIDI Clock out")); + p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI Clock out")); _midi_clock_output_port= boost::dynamic_pointer_cast<MidiPort> (p); /* These ports all need their incoming data handled in diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 54287a454a..40123e0670 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -559,10 +559,10 @@ Session::setup_ltc () { XMLNode* child = 0; - _ltc_input.reset (new IO (*this, _("LTC In"), IO::Input)); - _ltc_output.reset (new IO (*this, _("LTC Out"), IO::Output)); + _ltc_input.reset (new IO (*this, X_("LTC In"), IO::Input)); + _ltc_output.reset (new IO (*this, X_("LTC Out"), IO::Output)); - if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-In")) != 0) { + if (state_tree && (child = find_named_node (*state_tree->root(), X_("LTC In"))) != 0) { _ltc_input->set_state (*(child->children().front()), Stateful::loading_state_version); } else { { @@ -572,7 +572,7 @@ Session::setup_ltc () reconnect_ltc_input (); } - if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-Out")) != 0) { + if (state_tree && (child = find_named_node (*state_tree->root(), X_("LTC Out"))) != 0) { _ltc_output->set_state (*(child->children().front()), Stateful::loading_state_version); } else { { @@ -586,15 +586,15 @@ Session::setup_ltc () * IO style of NAME/TYPE-{in,out}N */ - _ltc_input->nth (0)->set_name (_("LTC-in")); - _ltc_output->nth (0)->set_name (_("LTC-out")); + _ltc_input->nth (0)->set_name (X_("LTC-in")); + _ltc_output->nth (0)->set_name (X_("LTC-out")); } void Session::setup_click () { _clicking = false; - _click_io.reset (new ClickIO (*this, "click")); + _click_io.reset (new ClickIO (*this, X_("Click"))); _click_gain.reset (new Amp (*this)); _click_gain->activate (); if (state_tree) { |