noop OSC: path strings should not get tranlated
[ardour.git] / libs / surfaces / osc / osc_select_observer.cc
index fd9552273894c2638733584fd97a00bdec6ce0d3..a50588a20f6e97165688292806b00200e45a7c15 100644 (file)
@@ -139,22 +139,22 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
        group_name ();
 
        _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::pi_changed, this, _1), OSC::instance());
-       _osc.float_message ("/select/hide", _strip->is_hidden (), addr);
+       _osc.float_message (X_("/select/hide"), _strip->is_hidden (), addr);
 
        _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/mute"), _strip->mute_control()), OSC::instance());
-       change_message ("/select/mute", _strip->mute_control());
+       change_message (X_("/select/mute"), _strip->mute_control());
 
        _strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance());
-       change_message ("/select/solo", _strip->solo_control());
+       change_message (X_("/select/solo"), _strip->solo_control());
 
        if (_strip->solo_isolate_control()) {
                _strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
-               change_message ("/select/solo_iso", _strip->solo_isolate_control());
+               change_message (X_("/select/solo_iso"), _strip->solo_isolate_control());
        }
 
        if (_strip->solo_safe_control()) {
                _strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
-               change_message ("/select/solo_safe", _strip->solo_safe_control());
+               change_message (X_("/select/solo_safe"), _strip->solo_safe_control());
        }
 
        boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
@@ -166,19 +166,19 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
        boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
        if (rec_controllable) {
                rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/recenable"), _strip->rec_enable_control()), OSC::instance());
-               change_message ("/select/recenable", _strip->rec_enable_control());
+               change_message (X_("/select/recenable"), _strip->rec_enable_control());
        }
 
        boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
        if (recsafe_controllable) {
                recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/record_safe"), _strip->rec_safe_control()), OSC::instance());
-               change_message ("/select/record_safe", _strip->rec_safe_control());
+               change_message (X_("/select/record_safe"), _strip->rec_safe_control());
        }
 
        boost::shared_ptr<AutomationControl> phase_controllable = _strip->phase_control ();
        if (phase_controllable) {
                phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance());
-               change_message ("/select/polarity", _strip->phase_control());
+               change_message (X_("/select/polarity"), _strip->phase_control());
        }
 
        _strip->gain_control()->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_automation, this), OSC::instance());
@@ -188,33 +188,33 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
        boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
        if (trim_controllable) {
                trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::trim_message, this, X_("/select/trimdB"), _strip->trim_control()), OSC::instance());
-               trim_message ("/select/trimdB", _strip->trim_control());
+               trim_message (X_("/select/trimdB"), _strip->trim_control());
        }
 
        boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
        if (pan_controllable) {
                pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
-               change_message ("/select/pan_stereo_position", _strip->pan_azimuth_control());
+               change_message (X_("/select/pan_stereo_position"), _strip->pan_azimuth_control());
        }
 
        boost::shared_ptr<Controllable> width_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_width_control());
        if (width_controllable) {
                width_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_stereo_width"), _strip->pan_width_control()), OSC::instance());
-               change_message ("/select/pan_stereo_width", _strip->pan_width_control());
+               change_message (X_("/select/pan_stereo_width"), _strip->pan_width_control());
        }
 
        // Rest of possible pan controls... Untested because I can't find a way to get them in the GUI :)
        if (_strip->pan_elevation_control ()) {
                _strip->pan_elevation_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_elevation_position"), _strip->pan_elevation_control()), OSC::instance());
-               change_message ("/select/pan_elevation_position", _strip->pan_elevation_control());
+               change_message (X_("/select/pan_elevation_position"), _strip->pan_elevation_control());
        }
        if (_strip->pan_frontback_control ()) {
                _strip->pan_frontback_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_frontback_position"), _strip->pan_frontback_control()), OSC::instance());
-               change_message ("/select/pan_frontback_position", _strip->pan_frontback_control());
+               change_message (X_("/select/pan_frontback_position"), _strip->pan_frontback_control());
        }
        if (_strip->pan_lfe_control ()) {
                _strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_control"), _strip->pan_lfe_control()), OSC::instance());
-               change_message ("/select/pan_lfe_control", _strip->pan_lfe_control());
+               change_message (X_("/select/pan_lfe_control"), _strip->pan_lfe_control());
        }
 
        // sends, plugins and eq
@@ -223,21 +223,21 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
        // but... MB master send enable is different
        if (_strip->master_send_enable_controllable ()) {
                _strip->master_send_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/master_send_enable"), _strip->master_send_enable_controllable()), OSC::instance());
-               enable_message ("/select/master_send_enable", _strip->master_send_enable_controllable());
+               enable_message (X_("/select/master_send_enable"), _strip->master_send_enable_controllable());
        }
 
        // Compressor
        if (_strip->comp_enable_controllable ()) {
                _strip->comp_enable_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/comp_enable"), _strip->comp_enable_controllable()), OSC::instance());
-               enable_message ("/select/comp_enable", _strip->comp_enable_controllable());
+               enable_message (X_("/select/comp_enable"), _strip->comp_enable_controllable());
        }
        if (_strip->comp_threshold_controllable ()) {
                _strip->comp_threshold_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_threshold"), _strip->comp_threshold_controllable()), OSC::instance());
-               change_message ("/select/comp_threshold", _strip->comp_threshold_controllable());
+               change_message (X_("/select/comp_threshold"), _strip->comp_threshold_controllable());
        }
        if (_strip->comp_speed_controllable ()) {
                _strip->comp_speed_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_speed"), _strip->comp_speed_controllable()), OSC::instance());
-               change_message ("/select/comp_speed", _strip->comp_speed_controllable());
+               change_message (X_("/select/comp_speed"), _strip->comp_speed_controllable());
        }
        if (_strip->comp_mode_controllable ()) {
                _strip->comp_mode_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comp_mode, this), OSC::instance());
@@ -245,7 +245,7 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip
        }
        if (_strip->comp_makeup_controllable ()) {
                _strip->comp_makeup_controllable ()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/comp_makeup"), _strip->comp_makeup_controllable()), OSC::instance());
-               change_message ("/select/comp_makeup", _strip->comp_makeup_controllable());
+               change_message (X_("/select/comp_makeup"), _strip->comp_makeup_controllable());
        }
        renew_sends ();
        renew_plugin ();
@@ -261,9 +261,9 @@ OSCSelectObserver::set_expand (uint32_t expand)
        if (expand != _expand) {
                _expand = expand;
                if (expand) {
-                       _osc.float_message ("/select/expand", 1.0, addr);
+                       _osc.float_message (X_("/select/expand"), 1.0, addr);
                } else {
-                       _osc.float_message ("/select/expand", 0.0, addr);
+                       _osc.float_message (X_("/select/expand"), 0.0, addr);
                }
        }
 }
@@ -274,50 +274,50 @@ OSCSelectObserver::clear_observer ()
        _init = true;
        strip_connections.drop_connections ();
        // all strip buttons should be off and faders 0 and etc.
-       _osc.float_message ("/select/expand", 0, addr);
-       _osc.text_message ("/select/name", " ", addr);
-       _osc.text_message ("/select/group/name", " ", addr);
-       _osc.text_message ("/select/comment", " ", addr);
-       _osc.float_message ("/select/mute", 0, addr);
-       _osc.float_message ("/select/solo", 0, addr);
-       _osc.float_message ("/select/recenable", 0, addr);
-       _osc.float_message ("/select/record_safe", 0, addr);
-       _osc.float_message ("/select/monitor_input", 0, addr);
-       _osc.float_message ("/select/monitor_disk", 0, addr);
-       _osc.float_message ("/select/polarity", 0, addr);
-       _osc.float_message ("/select/n_inputs", 0, addr);
-       _osc.float_message ("/select/n_outputs", 0, addr);
+       _osc.float_message (X_("/select/expand"), 0, addr);
+       _osc.text_message (X_("/select/name"), " ", addr);
+       _osc.text_message (X_("/select/group/name"), " ", addr);
+       _osc.text_message (X_("/select/comment"), " ", addr);
+       _osc.float_message (X_("/select/mute"), 0, addr);
+       _osc.float_message (X_("/select/solo"), 0, addr);
+       _osc.float_message (X_("/select/recenable"), 0, addr);
+       _osc.float_message (X_("/select/record_safe"), 0, addr);
+       _osc.float_message (X_("/select/monitor_input"), 0, addr);
+       _osc.float_message (X_("/select/monitor_disk"), 0, addr);
+       _osc.float_message (X_("/select/polarity"), 0, addr);
+       _osc.float_message (X_("/select/n_inputs"), 0, addr);
+       _osc.float_message (X_("/select/n_outputs"), 0, addr);
        if (gainmode) {
-               _osc.float_message ("/select/fader", 0, addr);
+               _osc.float_message (X_("/select/fader"), 0, addr);
        } else {
-               _osc.float_message ("/select/gain", -193, addr);
+               _osc.float_message (X_("/select/gain"), -193, addr);
        }
-       _osc.float_message ("/select/trimdB", 0, addr);
-       _osc.float_message ("/select/pan_stereo_position", 0.5, addr);
-       _osc.float_message ("/select/pan_stereo_width", 1, addr);
+       _osc.float_message (X_("/select/trimdB"), 0, addr);
+       _osc.float_message (X_("/select/pan_stereo_position"), 0.5, addr);
+       _osc.float_message (X_("/select/pan_stereo_width"), 1, addr);
        if (feedback[9]) {
-               _osc.float_message ("/select/signal", 0, addr);
+               _osc.float_message (X_("/select/signal"), 0, addr);
        }
        if (feedback[7]) {
                if (gainmode) {
-                       _osc.float_message ("/select/meter", 0, addr);
+                       _osc.float_message (X_("/select/meter"), 0, addr);
                } else {
-                       _osc.float_message ("/select/meter", -193, addr);
+                       _osc.float_message (X_("/select/meter"), -193, addr);
                }
        }else if (feedback[8]) {
-               _osc.float_message ("/select/meter", 0, addr);
-       }
-       _osc.float_message ("/select/pan_elevation_position", 0, addr);
-       _osc.float_message ("/select/pan_frontback_position", .5, addr);
-       _osc.float_message ("/select/pan_lfe_control", 0, addr);
-       _osc.float_message ("/select/comp_enable", 0, addr);
-       _osc.float_message ("/select/comp_threshold", 0, addr);
-       _osc.float_message ("/select/comp_speed", 0, addr);
-       _osc.float_message ("/select/comp_mode", 0, addr);
-       _osc.text_message ("/select/comp_mode_name", " ", addr);
-       _osc.text_message ("/select/comp_speed_name", " ", addr);
-       _osc.float_message ("/select/comp_makeup", 0, addr);
-       _osc.float_message ("/select/expand", 0.0, addr);
+               _osc.float_message (X_("/select/meter"), 0, addr);
+       }
+       _osc.float_message (X_("/select/pan_elevation_position"), 0, addr);
+       _osc.float_message (X_("/select/pan_frontback_position"), .5, addr);
+       _osc.float_message (X_("/select/pan_lfe_control"), 0, addr);
+       _osc.float_message (X_("/select/comp_enable"), 0, addr);
+       _osc.float_message (X_("/select/comp_threshold"), 0, addr);
+       _osc.float_message (X_("/select/comp_speed"), 0, addr);
+       _osc.float_message (X_("/select/comp_mode"), 0, addr);
+       _osc.text_message (X_("/select/comp_mode_name"), " ", addr);
+       _osc.text_message (X_("/select/comp_speed_name"), " ", addr);
+       _osc.float_message (X_("/select/comp_makeup"), 0, addr);
+       _osc.float_message (X_("/select/expand"), 0.0, addr);
        send_end();
        plugin_end();
        eq_end();
@@ -374,28 +374,28 @@ OSCSelectObserver::send_init()
                        send_valid = true;
                } else {
                        send_gain (c, _strip->send_level_controllable(s));
-                       _osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
-                       _osc.text_message_with_id ("/select/send_name", c, " ", in_line, addr);
+                       _osc.float_message_with_id (X_("/select/send_enable"), c, 0, in_line, addr);
+                       _osc.text_message_with_id (X_("/select/send_name"), c, " ", in_line, addr);
                }
 
                if (_strip->send_enable_controllable (s)) {
                        _strip->send_enable_controllable(s)->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message_with_id, this, X_("/select/send_enable"), c, _strip->send_enable_controllable(s)), OSC::instance());
-                       enable_message_with_id ("/select/send_enable", c, _strip->send_enable_controllable(s));
+                       enable_message_with_id (X_("/select/send_enable"), c, _strip->send_enable_controllable(s));
                } else if (send_valid) {
                        boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (_strip);
                        if (!r) {
                                // should never get here
-                               _osc.float_message_with_id ("/select/send_enable", c, 0, in_line, addr);
+                               _osc.float_message_with_id (X_("/select/send_enable"), c, 0, in_line, addr);
                        }
                        boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(s));
                        if (snd) {
                                boost::shared_ptr<Processor> proc = boost::dynamic_pointer_cast<Processor> (snd);
                                proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_enable, this, X_("/select/send_enable"), c, proc), OSC::instance());
-                               _osc.float_message_with_id ("/select/send_enable", c, proc->enabled(), in_line, addr);
+                               _osc.float_message_with_id (X_("/select/send_enable"), c, proc->enabled(), in_line, addr);
                        }
                }
                if ((gainmode != 1) && send_valid) {
-                       _osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), in_line, addr);
+                       _osc.text_message_with_id (X_("/select/send_name"), c, _strip->send_name(s), in_line, addr);
                }
        }
 }
@@ -406,14 +406,14 @@ OSCSelectObserver::send_end ()
        send_connections.drop_connections ();
        for (uint32_t i = 1; i <= send_size; i++) {
                if (gainmode) {
-                       _osc.float_message_with_id ("/select/send_fader", i, 0, in_line, addr);
+                       _osc.float_message_with_id (X_("/select/send_fader"), i, 0, in_line, addr);
                } else {
-                       _osc.float_message_with_id ("/select/send_gain", i, -193, in_line, addr);
+                       _osc.float_message_with_id (X_("/select/send_gain"), i, -193, in_line, addr);
                }
                // next enable
-               _osc.float_message_with_id ("/select/send_enable", i, 0, in_line, addr);
+               _osc.float_message_with_id (X_("/select/send_enable"), i, 0, in_line, addr);
                // next name
-               _osc.text_message_with_id ("/select/send_name", i, " ", in_line, addr);
+               _osc.text_message_with_id (X_("/select/send_name"), i, " ", in_line, addr);
        }
        // need to delete or clear send_timeout
        send_size = 0;
@@ -471,7 +471,7 @@ OSCSelectObserver::plugin_init()
        boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
        // we have a plugin we can ask if it is activated
        proc->ActiveChanged.connect (plugin_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::plug_enable, this, X_("/select/plugin/activate"), proc), OSC::instance());
-       _osc.float_message ("/select/plugin/activate", proc->enabled(), addr);
+       _osc.float_message (X_("/select/plugin/activate"), proc->enabled(), addr);
 
        bool ok = false;
        // put only input controls into a vector
@@ -493,15 +493,15 @@ OSCSelectObserver::plugin_init()
        if (plug_page_size) {
                plug_size = plug_page_size;
        }
-       _osc.text_message ("/select/plugin/name", pip->name(), addr);
+       _osc.text_message (X_("/select/plugin/name"), pip->name(), addr);
        uint32_t page_start = plug_page - 1;
        uint32_t page_end = page_start + plug_size;
 
        int pid = 1;
        for ( uint32_t ppi = page_start;  ppi < page_end; ++ppi, ++pid) {
                if (ppi >= nplug_params) {
-                       _osc.text_message_with_id ("/select/plugin/parameter/name", pid, " ", in_line, addr);
-                       _osc.float_message_with_id ("/select/plugin/parameter", pid, 0, in_line, addr);
+                       _osc.text_message_with_id (X_("/select/plugin/parameter/name"), pid, " ", in_line, addr);
+                       _osc.float_message_with_id (X_("/select/plugin/parameter"), pid, 0, in_line, addr);
                        continue;
                }
 
@@ -511,7 +511,7 @@ OSCSelectObserver::plugin_init()
                }
                ParameterDescriptor pd;
                pip->get_parameter_descriptor(controlid, pd);
-               _osc.text_message_with_id ("/select/plugin/parameter/name", pid, pd.label, in_line, addr);
+               _osc.text_message_with_id (X_("/select/plugin/parameter/name"), pid, pd.label, in_line, addr);
                if ( pip->parameter_is_input(controlid)) {
                        boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
                        if (c) {
@@ -530,9 +530,9 @@ void
 OSCSelectObserver::plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr<PBD::Controllable> controllable)
 {
        if (swtch) {
-               enable_message_with_id ("/select/plugin/parameter", pid, controllable);
+               enable_message_with_id (X_("/select/plugin/parameter"), pid, controllable);
        } else {
-               change_message_with_id ("/select/plugin/parameter", pid, controllable);
+               change_message_with_id (X_("/select/plugin/parameter"), pid, controllable);
        }
 }
 
@@ -540,12 +540,12 @@ void
 OSCSelectObserver::plugin_end ()
 {
        plugin_connections.drop_connections ();
-       _osc.float_message ("/select/plugin/activate", 0, addr);
-       _osc.text_message ("/select/plugin/name", " ", addr);
+       _osc.float_message (X_("/select/plugin/activate"), 0, addr);
+       _osc.text_message (X_("/select/plugin/name"), " ", addr);
        for (uint32_t i = 1; i <= plug_size; i++) {
-               _osc.float_message_with_id ("/select/plugin/parameter", i, 0, in_line, addr);
+               _osc.float_message_with_id (X_("/select/plugin/parameter"), i, 0, in_line, addr);
                // next name
-               _osc.text_message_with_id ("/select/plugin/parameter/name", i, " ", in_line, addr);
+               _osc.text_message_with_id (X_("/select/plugin/parameter/name"), i, " ", in_line, addr);
        }
        plug_size = 0;
        nplug_params = 0;
@@ -568,7 +568,7 @@ OSCSelectObserver::tick ()
                if (now_meter < -144) now_meter = -193;
                if (_last_meter != now_meter) {
                        if (feedback[7] || feedback[8]) {
-                               string path = "/select/meter";
+                               string path = X_("/select/meter");
                                if (gainmode && feedback[7]) {
                                        _osc.float_message (path, ((now_meter + 94) / 100), addr);
                                } else if ((!gainmode) && feedback[7]) {
@@ -580,7 +580,7 @@ OSCSelectObserver::tick ()
                                }
                        }
                        if (feedback[9]) {
-                               string path = "/select/signal";
+                               string path = X_("/select/signal");
                                float signal;
                                if (now_meter < -40) {
                                        signal = 0;
@@ -595,7 +595,7 @@ OSCSelectObserver::tick ()
        }
        if (gain_timeout) {
                if (gain_timeout == 1) {
-                       _osc.text_message ("/select/name", _strip->name(), addr);
+                       _osc.text_message (X_("/select/name"), _strip->name(), addr);
                }
                gain_timeout--;
        }
@@ -609,7 +609,7 @@ OSCSelectObserver::tick ()
        if (_strip->comp_redux_controllable() && _strip->comp_enable_controllable() && _strip->comp_enable_controllable()->get_value()) {
                float new_value = _strip->comp_redux_controllable()->get_parameter();
                if (_comp_redux != new_value) {
-                       _osc.float_message ("/select/comp_redux", new_value, addr);
+                       _osc.float_message (X_("/select/comp_redux"), new_value, addr);
                        _comp_redux = new_value;
                }
        }
@@ -617,7 +617,7 @@ OSCSelectObserver::tick ()
                if (send_timeout[i]) {
                        if (send_timeout[i] == 1) {
                                uint32_t pg_offset = (send_page - 1) * send_page_size;
-                               _osc.text_message_with_id ("/select/send_name", i, _strip->send_name(pg_offset + i - 1), in_line, addr);
+                               _osc.text_message_with_id (X_("/select/send_name"), i, _strip->send_name(pg_offset + i - 1), in_line, addr);
                        }
                        send_timeout[i]--;
                }
@@ -636,15 +636,15 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed)
                return;
        }
 
-       _osc.text_message ("/select/name", _strip->name(), addr);
+       _osc.text_message (X_("/select/name"), _strip->name(), addr);
        boost::shared_ptr<Route> route = boost::dynamic_pointer_cast<Route> (_strip);
        if (route) {
                //spit out the comment at the same time
-               _osc.text_message ("/select/comment", route->comment(), addr);
+               _osc.text_message (X_("/select/comment"), route->comment(), addr);
                // lets tell the surface how many inputs this strip has
-               _osc.float_message ("/select/n_inputs", (float) route->n_inputs().n_total(), addr);
+               _osc.float_message (X_("/select/n_inputs"), (float) route->n_inputs().n_total(), addr);
                // lets tell the surface how many outputs this strip has
-               _osc.float_message ("/select/n_outputs", (float) route->n_outputs().n_total(), addr);
+               _osc.float_message (X_("/select/n_outputs"), (float) route->n_outputs().n_total(), addr);
        }
 }
 
@@ -655,16 +655,16 @@ OSCSelectObserver::group_name ()
 
        RouteGroup *rg = rt->route_group();
        if (rg) {
-               _osc.text_message ("/select/group/name", rg->name(), addr);
+               _osc.text_message (X_("/select/group/name"), rg->name(), addr);
        } else {
-               _osc.text_message ("/select/group/name", " ", addr);
+               _osc.text_message (X_("/select/group/name"), " ", addr);
        }
 }
 
 void
 OSCSelectObserver::pi_changed (PBD::PropertyChange const& what_changed)
 {
-       _osc.float_message ("/select/hide", _strip->is_hidden (), addr);
+       _osc.float_message (X_("/select/hide"), _strip->is_hidden (), addr);
 }
 
 void
@@ -734,8 +734,8 @@ OSCSelectObserver::monitor_status (boost::shared_ptr<Controllable> controllable)
                        input = 0;
        }
 
-       _osc.float_message ("/select/monitor_input", (float) input, addr);
-       _osc.float_message ("/select/monitor_disk", (float) disk, addr);
+       _osc.float_message (X_("/select/monitor_input"), (float) input, addr);
+       _osc.float_message (X_("/select/monitor_disk"), (float) disk, addr);
 }
 
 void
@@ -761,17 +761,17 @@ OSCSelectObserver::gain_message ()
        }
 
        if (gainmode) {
-               _osc.float_message ("/select/fader", _strip->gain_control()->internal_to_interface (value), addr);
+               _osc.float_message (X_("/select/fader"), _strip->gain_control()->internal_to_interface (value), addr);
                if (gainmode == 1) {
-                       _osc.text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
+                       _osc.text_message (X_("/select/name"), string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr);
                        gain_timeout = 8;
                }
        }
        if (!gainmode || gainmode == 2) {
                if (value < 1e-15) {
-                       _osc.float_message ("/select/gain", -200, addr);
+                       _osc.float_message (X_("/select/gain"), -200, addr);
                } else {
-                       _osc.float_message ("/select/gain", accurate_coefficient_to_dB (value), addr);
+                       _osc.float_message (X_("/select/gain"), accurate_coefficient_to_dB (value), addr);
                }
        }
 }
@@ -804,11 +804,11 @@ OSCSelectObserver::gain_automation ()
        }
 
        if (gainmode) {
-               _osc.float_message ("/select/fader/automation", output, addr);
-               _osc.text_message ("/select/fader/automation_name", auto_name, addr);
+               _osc.float_message (X_("/select/fader/automation"), output, addr);
+               _osc.text_message (X_("/select/fader/automation_name"), auto_name, addr);
        } else {
-               _osc.float_message ("/select/gain/automation", output, addr);
-               _osc.text_message ("/select/gain/automation_name", auto_name, addr);
+               _osc.float_message (X_("/select/gain/automation"), output, addr);
+               _osc.text_message (X_("/select/gain/automation_name"), auto_name, addr);
        }
 
        gain_message ();
@@ -847,16 +847,16 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr<PBD::Controllable>
                if (controllable) {
                        value = controllable->internal_to_interface (raw_value);
                }
-               _osc.float_message_with_id ("/select/send_fader", id, value, in_line, addr);
+               _osc.float_message_with_id (X_("/select/send_fader"), id, value, in_line, addr);
                if (gainmode == 1) {
-                       _osc.text_message_with_id ("/select/send_name" , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), in_line, addr);
+                       _osc.text_message_with_id (X_("/select/send_name") , id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), db), in_line, addr);
                        if (send_timeout.size() > id) {
                                send_timeout[id] = 8;
                        }
                }
        }
        if (!gainmode || gainmode == 2) {
-               _osc.float_message_with_id ("/select/send_gain", id, db, in_line, addr);
+               _osc.float_message_with_id (X_("/select/send_gain"), id, db, in_line, addr);
        }
 
 }
@@ -867,15 +867,15 @@ OSCSelectObserver::send_enable (string path, uint32_t id, boost::shared_ptr<Proc
        // with no delay value is wrong
        Glib::usleep(10);
 
-       _osc.float_message_with_id ("/select/send_enable", id, proc->enabled(), in_line, addr);
+       _osc.float_message_with_id (X_("/select/send_enable"), id, proc->enabled(), in_line, addr);
 }
 
 void
 OSCSelectObserver::comp_mode ()
 {
-       change_message ("/select/comp_mode", _strip->comp_mode_controllable());
-       _osc.text_message ("/select/comp_mode_name", _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr);
-       _osc.text_message ("/select/comp_speed_name", _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr);
+       change_message (X_("/select/comp_mode"), _strip->comp_mode_controllable());
+       _osc.text_message (X_("/select/comp_mode_name"), _strip->comp_mode_name(_strip->comp_mode_controllable()->get_value()), addr);
+       _osc.text_message (X_("/select/comp_speed_name"), _strip->comp_speed_name(_strip->comp_mode_controllable()->get_value()), addr);
 }
 
 void
@@ -884,37 +884,37 @@ OSCSelectObserver::eq_init()
        // HPF and enable are special case, rest are in bands
        if (_strip->filter_enable_controllable (true)) {
                _strip->filter_enable_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/enable"), _strip->filter_enable_controllable (true)), OSC::instance());
-               change_message ("/select/eq_hpf/enable", _strip->filter_enable_controllable(true));
+               change_message (X_("/select/eq_hpf/enable"), _strip->filter_enable_controllable(true));
        }
 
        if (_strip->filter_enable_controllable (false)) {
                _strip->filter_enable_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/enable"), _strip->filter_enable_controllable (false)), OSC::instance());
-               change_message ("/select/eq_lpf/enable", _strip->filter_enable_controllable(false));
+               change_message (X_("/select/eq_lpf/enable"), _strip->filter_enable_controllable(false));
        }
 
        if (_strip->filter_freq_controllable (true)) {
                _strip->filter_freq_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/freq"), _strip->filter_freq_controllable (true)), OSC::instance());
-               change_message ("/select/eq_hpf/freq", _strip->filter_freq_controllable(true));
+               change_message (X_("/select/eq_hpf/freq"), _strip->filter_freq_controllable(true));
        }
 
        if (_strip->filter_freq_controllable (false)) {
                _strip->filter_freq_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/freq"), _strip->filter_freq_controllable (false)), OSC::instance());
-               change_message ("/select/eq_lpf/freq", _strip->filter_freq_controllable(false));
+               change_message (X_("/select/eq_lpf/freq"), _strip->filter_freq_controllable(false));
        }
 
        if (_strip->filter_slope_controllable (true)) {
                _strip->filter_slope_controllable (true)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_hpf/slope"), _strip->filter_slope_controllable (true)), OSC::instance());
-               change_message ("/select/eq_hpf/slope", _strip->filter_slope_controllable(true));
+               change_message (X_("/select/eq_hpf/slope"), _strip->filter_slope_controllable(true));
        }
 
        if (_strip->filter_slope_controllable (false)) {
                _strip->filter_slope_controllable (false)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/eq_lpf/slope"), _strip->filter_slope_controllable (false)), OSC::instance());
-               change_message ("/select/eq_lpf/slope", _strip->filter_slope_controllable(false));
+               change_message (X_("/select/eq_lpf/slope"), _strip->filter_slope_controllable(false));
        }
 
        if (_strip->eq_enable_controllable ()) {
                _strip->eq_enable_controllable ()->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::enable_message, this, X_("/select/eq_enable"), _strip->eq_enable_controllable()), OSC::instance());
-               enable_message ("/select/eq_enable", _strip->eq_enable_controllable());
+               enable_message (X_("/select/eq_enable"), _strip->eq_enable_controllable());
        }
 
        eq_bands = _strip->eq_band_cnt ();
@@ -927,23 +927,23 @@ OSCSelectObserver::eq_init()
 
        for (int i = 0; i < eq_bands; i++) {
                if (_strip->eq_band_name(i).size()) {
-                       _osc.text_message_with_id ("/select/eq_band_name", i + 1, _strip->eq_band_name (i), in_line, addr);
+                       _osc.text_message_with_id (X_("/select/eq_band_name"), i + 1, _strip->eq_band_name (i), in_line, addr);
                }
                if (_strip->eq_gain_controllable (i)) {
                        _strip->eq_gain_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_gain"), i + 1, _strip->eq_gain_controllable(i)), OSC::instance());
-                       change_message_with_id ("/select/eq_gain", i + 1, _strip->eq_gain_controllable(i));
+                       change_message_with_id (X_("/select/eq_gain"), i + 1, _strip->eq_gain_controllable(i));
                }
                if (_strip->eq_freq_controllable (i)) {
                        _strip->eq_freq_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_freq"), i + 1, _strip->eq_freq_controllable(i)), OSC::instance());
-                       change_message_with_id ("/select/eq_freq", i + 1, _strip->eq_freq_controllable(i));
+                       change_message_with_id (X_("/select/eq_freq"), i + 1, _strip->eq_freq_controllable(i));
                }
                if (_strip->eq_q_controllable (i)) {
                        _strip->eq_q_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_q"), i + 1, _strip->eq_q_controllable(i)), OSC::instance());
-                       change_message_with_id ("/select/eq_q", i + 1, _strip->eq_q_controllable(i));
+                       change_message_with_id (X_("/select/eq_q"), i + 1, _strip->eq_q_controllable(i));
                }
                if (_strip->eq_shape_controllable (i)) {
                        _strip->eq_shape_controllable(i)->Changed.connect (eq_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message_with_id, this, X_("/select/eq_shape"), i + 1, _strip->eq_shape_controllable(i)), OSC::instance());
-                       change_message_with_id ("/select/eq_shape", i + 1, _strip->eq_shape_controllable(i));
+                       change_message_with_id (X_("/select/eq_shape"), i + 1, _strip->eq_shape_controllable(i));
                }
        }
 }
@@ -952,15 +952,15 @@ void
 OSCSelectObserver::eq_end ()
 {
        eq_connections.drop_connections ();
-               _osc.float_message ("/select/eq_hpf", 0, addr);
-               _osc.float_message ("/select/eq_enable", 0, addr);
+               _osc.float_message (X_("/select/eq_hpf"), 0, addr);
+               _osc.float_message (X_("/select/eq_enable"), 0, addr);
 
        for (int i = 1; i <= eq_bands; i++) {
-               _osc.text_message_with_id ("/select/eq_band_name", i, " ", in_line, addr);
-               _osc.float_message_with_id ("/select/eq_gain", i, 0, in_line, addr);
-               _osc.float_message_with_id ("/select/eq_freq", i, 0, in_line, addr);
-               _osc.float_message_with_id ("/select/eq_q", i, 0, in_line, addr);
-               _osc.float_message_with_id ("/select/eq_shape", i, 0, in_line, addr);
+               _osc.text_message_with_id (X_("/select/eq_band_name"), i, " ", in_line, addr);
+               _osc.float_message_with_id (X_("/select/eq_gain"), i, 0, in_line, addr);
+               _osc.float_message_with_id (X_("/select/eq_freq"), i, 0, in_line, addr);
+               _osc.float_message_with_id (X_("/select/eq_q"), i, 0, in_line, addr);
+               _osc.float_message_with_id (X_("/select/eq_shape"), i, 0, in_line, addr);
 
 
        }