X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_select_observer.cc;h=5b68f08241b41b17f256ccf905e53f86157cedc9;hb=a9d041c62ef209c861a41dd65e39ad62058fd523;hp=5ad7f2226ada99a13fd1f22e696166e66a87e52f;hpb=da467cf39b73e2a4ddc243bfa1791306625b5302;p=ardour.git diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 5ad7f2226a..5b68f08241 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -31,6 +31,7 @@ #include "ardour/solo_isolate_control.h" #include "ardour/solo_safe_control.h" #include "ardour/route.h" +#include "ardour/route_group.h" #include "ardour/send.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" @@ -64,9 +65,17 @@ OSCSelectObserver::OSCSelectObserver (OSC& o, ArdourSurface::OSC::OSCSurface* su feedback = sur->feedback; in_line = feedback[2]; send_page_size = sur->send_page_size; - plug_page_size = sur->plug_page_size; + send_size = send_page_size; send_page = sur->send_page; - refresh_strip (sur->select, sur->nsends, true); + plug_page_size = sur->plug_page_size; + plug_size = plug_page_size; + plug_page = sur->plug_page; + if (sur->plugins.size () > 0) { + plug_id = sur->plugins[sur->plugin_id - 1]; + } else { + plug_id = -1; + } + refresh_strip (sur->select, sur->nsends, gainmode, true); set_expand (sur->expand_enable); } @@ -96,12 +105,13 @@ OSCSelectObserver::no_strip () } void -OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip, uint32_t s_nsends, bool force) +OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip, uint32_t s_nsends, uint32_t gm, bool force) { _init = true; if (_tick_busy) { Glib::usleep(100); // let tick finish } + gainmode = gm; if (_strip && (new_strip == _strip) && !force) { _init = false; @@ -116,8 +126,6 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::no_strip, this), OSC::instance()); as = ARDOUR::Off; - send_size = 0; - plug_size = 0; _comp_redux = 1; nsends = s_nsends; _last_gain = -1.0; @@ -126,20 +134,32 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance()); name_changed (ARDOUR::Properties::name); + boost::shared_ptr rt = boost::dynamic_pointer_cast (_strip); + if (rt) { + rt->route_group_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::group_name, this), OSC::instance()); + group_name (); + + rt->comment_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::comment_changed, this), OSC::instance()); + comment_changed (); + } + + _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::pi_changed, this, _1), OSC::instance()); + _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 = boost::dynamic_pointer_cast (_strip); @@ -151,19 +171,19 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip boost::shared_ptr 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 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 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()); @@ -173,33 +193,33 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr new_strip boost::shared_ptr trim_controllable = boost::dynamic_pointer_cast(_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 pan_controllable = boost::dynamic_pointer_cast(_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 width_controllable = boost::dynamic_pointer_cast(_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 @@ -208,21 +228,21 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr 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()); @@ -230,7 +250,7 @@ OSCSelectObserver::refresh_strip (boost::shared_ptr 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 (); @@ -246,81 +266,84 @@ 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); } } } -void -OSCSelectObserver::set_send_page (uint32_t page) -{ - send_page = page; - renew_sends (); -} - -void -OSCSelectObserver::set_send_size (uint32_t size) -{ - send_page_size = size; - renew_sends (); -} - void 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/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"), " ", 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(); } +void +OSCSelectObserver::set_send_page (uint32_t page) +{ + if (send_page != page) { + send_page = page; + renew_sends (); + } +} + +void +OSCSelectObserver::set_send_size (uint32_t size) +{ + send_page_size = size; + renew_sends (); +} + void OSCSelectObserver::renew_sends () { send_connections.drop_connections (); @@ -328,12 +351,6 @@ OSCSelectObserver::renew_sends () { send_init(); } -void -OSCSelectObserver::renew_plugin () { - plugin_end(); - plugin_init(); -} - void OSCSelectObserver::send_init() { @@ -362,91 +379,144 @@ 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 r = boost::dynamic_pointer_cast (_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 snd = boost::dynamic_pointer_cast (r->nth_send(s)); if (snd) { boost::shared_ptr proc = boost::dynamic_pointer_cast (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 && send_valid) { - _osc.text_message_with_id ("/select/send_name", c, _strip->send_name(s), in_line, addr); + if ((gainmode != 1) && send_valid) { + _osc.text_message_with_id (X_("/select/send_name"), c, _strip->send_name(s), in_line, addr); } } } +void +OSCSelectObserver::send_end () +{ + send_connections.drop_connections (); + for (uint32_t i = 1; i <= send_size; i++) { + if (gainmode) { + _osc.float_message_with_id (X_("/select/send_fader"), i, 0, in_line, addr); + } else { + _osc.float_message_with_id (X_("/select/send_gain"), i, -193, in_line, addr); + } + // next enable + _osc.float_message_with_id (X_("/select/send_enable"), i, 0, in_line, addr); + // next name + _osc.text_message_with_id (X_("/select/send_name"), i, " ", in_line, addr); + } + // need to delete or clear send_timeout + send_size = 0; + send_timeout.clear(); +} + +void +OSCSelectObserver::set_plugin_id (int id, uint32_t page) +{ + plug_id = id; + plug_page = page; + renew_plugin (); +} + +void +OSCSelectObserver::set_plugin_page (uint32_t page) +{ + plug_page = page; + renew_plugin (); +} + +void +OSCSelectObserver::set_plugin_size (uint32_t size) +{ + plug_page_size = size; + renew_plugin (); +} + +void +OSCSelectObserver::renew_plugin () { + plugin_connections.drop_connections (); + plugin_init(); +} + void OSCSelectObserver::plugin_init() { - if (!sur->plugin_id || !sur->plugins.size ()) { + if (plug_id < 0) { + plugin_end (); return; } - boost::shared_ptr r = boost::dynamic_pointer_cast(_strip); if (!r) { + plugin_end (); return; } // we have a plugin number now get the processor - boost::shared_ptr proc = r->nth_plugin (sur->plugins[sur->plugin_id - 1]); + boost::shared_ptr proc = r->nth_plugin (plug_id); boost::shared_ptr pi; if (!(pi = boost::dynamic_pointer_cast(proc))) { + plugin_end (); return; } boost::shared_ptr 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 (X_("/select/plugin/activate"), proc->enabled(), addr); bool ok = false; - nplug_params = sur->plug_params.size (); + // put only input controls into a vector + plug_params.clear (); + uint32_t nplug_params = pip->parameter_count(); + for ( uint32_t ppi = 0; ppi < nplug_params; ++ppi) { + uint32_t controlid = pip->nth_parameter(ppi, ok); + if (!ok) { + continue; + } + if (pip->parameter_is_input(controlid)) { + plug_params.push_back (ppi); + } + } + nplug_params = plug_params.size (); // default of 0 page size means show all plug_size = nplug_params; if (plug_page_size) { plug_size = plug_page_size; } - _osc.text_message ("/select/plugin/name", pip->name(), addr); - uint32_t page_end = nplug_params; - uint32_t max_page = 1; - if (plug_size && nplug_params) { - max_page = (uint32_t)((nplug_params - 1) / plug_size) + 1; - } - - if (sur->plug_page < 1) { - sur->plug_page = 1; - } - if ((uint32_t)sur->plug_page > max_page) { - sur->plug_page = max_page; - } - uint32_t page_start = ((sur->plug_page - 1) * plug_size); - page_end = sur->plug_page * plug_size; + _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; } - uint32_t controlid = pip->nth_parameter(sur->plug_params[ppi], ok); + uint32_t controlid = pip->nth_parameter(plug_params[ppi], ok); if (!ok) { continue; } 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 c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); if (c) { @@ -461,32 +531,13 @@ OSCSelectObserver::plugin_init() } } -void -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); - } else { - _osc.float_message_with_id ("/select/send_gain", i, -193, in_line, addr); - } - // next enable - _osc.float_message_with_id ("/select/send_enable", i, 0, in_line, addr); - // next name - _osc.text_message_with_id ("/select/send_name", i, " ", in_line, addr); - } - // need to delete or clear send_timeout - send_timeout.clear(); -} - void OSCSelectObserver::plugin_parameter_changed (int pid, bool swtch, boost::shared_ptr 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); } } @@ -494,12 +545,14 @@ void OSCSelectObserver::plugin_end () { plugin_connections.drop_connections (); - _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; } @@ -520,7 +573,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]) { @@ -532,7 +585,7 @@ OSCSelectObserver::tick () } } if (feedback[9]) { - string path = "/select/signal"; + string path = X_("/select/signal"); float signal; if (now_meter < -40) { signal = 0; @@ -547,7 +600,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--; } @@ -561,7 +614,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; } } @@ -569,7 +622,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]--; } @@ -588,18 +641,44 @@ 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 = boost::dynamic_pointer_cast (_strip); if (route) { - //spit out the comment at the same time - _osc.text_message ("/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); } } +void +OSCSelectObserver::group_name () +{ + boost::shared_ptr rt = boost::dynamic_pointer_cast (_strip); + + RouteGroup *rg = rt->route_group(); + if (rg) { + _osc.text_message (X_("/select/group"), rg->name(), addr); + } else { + _osc.text_message (X_("/select/group"), " ", addr); + } +} + +void +OSCSelectObserver::comment_changed () +{ + boost::shared_ptr rt = boost::dynamic_pointer_cast (_strip); + if (rt) { + _osc.text_message (X_("/select/comment"), rt->comment(), addr); + } +} + +void +OSCSelectObserver::pi_changed (PBD::PropertyChange const& what_changed) +{ + _osc.float_message (X_("/select/hide"), _strip->is_hidden (), addr); +} + void OSCSelectObserver::change_message (string path, boost::shared_ptr controllable) { @@ -620,6 +699,15 @@ OSCSelectObserver::enable_message (string path, boost::shared_ptr } +void +OSCSelectObserver::plug_enable (string path, boost::shared_ptr proc) +{ + // with no delay value is wrong + Glib::usleep(10); + + _osc.float_message (path, proc->enabled(), addr); +} + void OSCSelectObserver::change_message_with_id (string path, uint32_t id, boost::shared_ptr controllable) { @@ -658,8 +746,8 @@ OSCSelectObserver::monitor_status (boost::shared_ptr 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 @@ -685,14 +773,17 @@ OSCSelectObserver::gain_message () } if (gainmode) { - _osc.text_message ("/select/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (value)), addr); - gain_timeout = 8; - _osc.float_message ("/select/fader", _strip->gain_control()->internal_to_interface (value), addr); - } else { + _osc.float_message (X_("/select/fader"), _strip->gain_control()->internal_to_interface (value), addr); + if (gainmode == 1) { + _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); } } } @@ -725,11 +816,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 (); @@ -765,20 +856,21 @@ OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr #endif if (gainmode) { - path = "/select/send_fader"; if (controllable) { value = controllable->internal_to_interface (raw_value); } - _osc.text_message_with_id ("/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; + _osc.float_message_with_id (X_("/select/send_fader"), id, value, in_line, addr); + if (gainmode == 1) { + _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; + } } - } else { - path = "/select/send_gain"; - value = db; + } + if (!gainmode || gainmode == 2) { + _osc.float_message_with_id (X_("/select/send_gain"), id, db, in_line, addr); } - _osc.float_message_with_id (path, id, value, in_line, addr); } void @@ -787,15 +879,15 @@ OSCSelectObserver::send_enable (string path, uint32_t id, boost::shared_ptrenabled(), 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 @@ -804,37 +896,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 (); @@ -847,23 +939,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)); } } } @@ -872,15 +964,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); }