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).

diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index d17401cee88978cfbbe33fac718f0d813fd7d95a..6de043658690187d0af697e02e29c9fdb8f8951b 100644 (file)
--- 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 54287a454abb7697e5604eebf53eceeadeb17e7e..40123e06702b0be5678d44c2de96c24635926ea8 100644 (file)
--- 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) {