X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_route_observer.cc;h=840142f4a6b18138a0f9a088d389154e4a4de0a9;hb=0141700d4b448f1aa5dea1ae6d30079ec7962667;hp=b37f67e92e06a90ca51a65969bbe756032821b0f;hpb=2ea14c25ecfe08f6ce68365357840f79ccf5fb8a;p=ardour.git diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index b37f67e92e..840142f4a6 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -20,12 +20,21 @@ #include "boost/lambda/lambda.hpp" #include "pbd/control_math.h" +#include + #include "ardour/session.h" #include "ardour/track.h" #include "ardour/monitor_control.h" #include "ardour/dB.h" #include "ardour/meter.h" +#include "ardour/panner.h" +#include "ardour/panner_shell.h" +#include "ardour/pannable.h" +#include "ardour/route.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/solo_isolate_control.h" #include "osc.h" #include "osc_route_observer.h" @@ -37,26 +46,124 @@ using namespace PBD; using namespace ARDOUR; using namespace ArdourSurface; -OSCRouteObserver::OSCRouteObserver (boost::shared_ptr s, lo_address a, uint32_t ss, ArdourSurface::OSC::OSCSurface* su) - : _strip (s) +OSCRouteObserver::OSCRouteObserver (OSC& o, uint32_t ss, ArdourSurface::OSC::OSCSurface* su) + : _osc (o) ,ssid (ss) ,sur (su) - ,_last_gain (0.0) + ,_last_gain (-1.0) + ,_last_trim (-1.0) + ,_init (true) + ,_expand (2048) { - addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a)); + addr = lo_address_new_from_url (sur->remote_url.c_str()); gainmode = sur->gainmode; feedback = sur->feedback; + in_line = feedback[2]; + uint32_t sid = sur->bank + ssid - 2; + uint32_t not_ready = 0; + if (sur->linkset) { + not_ready = _osc.link_sets[sur->linkset].not_ready; + } + if (not_ready) { + set_link_ready (not_ready); + } else if (sid >= sur->strips.size ()) { + // this _should_ only occure if the number of strips is less than banksize + _strip = boost::shared_ptr(); + clear_strip (); + } else { + _strip = sur->strips[sid]; + refresh_strip (_strip, true); + } + if (sur->expand_enable) { + set_expand (sur->expand); + } else { + set_expand (0); + } + _send = boost::shared_ptr (); +} + +OSCRouteObserver::~OSCRouteObserver () +{ + _init = true; + strip_connections.drop_connections (); + + lo_address_free (addr); +} + +void +OSCRouteObserver::no_strip () +{ + // This gets called on drop references + _init = true; + + strip_connections.drop_connections (); + _gain_control = boost::shared_ptr (); + _send = boost::shared_ptr (); + _strip = boost::shared_ptr (); + /* + * The strip will sit idle at this point doing nothing until + * the surface has recalculated it's strip list and then calls + * refresh_strip. Otherwise refresh strip will get a strip address + * that does not exist... Crash + */ + } + +void +OSCRouteObserver::refresh_strip (boost::shared_ptr new_strip, bool force) +{ + _init = true; + if (_tick_busy) { + Glib::usleep(100); // let tick finish + } + _last_gain =-1.0; + _last_trim =-1.0; + _send = boost::shared_ptr (); + + send_select_status (ARDOUR::Properties::selected); + + if ((new_strip == _strip) && !force) { + // no change don't send feedback + _init = false; + return; + } + strip_connections.drop_connections (); + _strip = new_strip; + if (!_strip) { + // this strip is blank and should be cleared + clear_strip (); + return; + } + _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::no_strip, this), OSC::instance()); as = ARDOUR::Off; if (feedback[0]) { // buttons are separate feedback _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::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 (&OSCRouteObserver::group_name, this), OSC::instance()); + group_name (); + } + + _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::pi_changed, this, _1), OSC::instance()); + _osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr); + _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/mute"), _strip->mute_control()), OSC::instance()); - send_change_message ("/strip/mute", _strip->mute_control()); + send_change_message (X_("/strip/mute"), _strip->mute_control()); _strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo"), _strip->solo_control()), OSC::instance()); - send_change_message ("/strip/solo", _strip->solo_control()); + send_change_message (X_("/strip/solo"), _strip->solo_control()); + + if (_strip->solo_isolate_control()) { + _strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_iso"), _strip->solo_isolate_control()), OSC::instance()); + send_change_message (X_("/strip/solo_iso"), _strip->solo_isolate_control()); + } + + if (_strip->solo_safe_control()) { + _strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_safe"), _strip->solo_safe_control()), OSC::instance()); + send_change_message (X_("/strip/solo_safe"), _strip->solo_safe_control()); + } boost::shared_ptr track = boost::dynamic_pointer_cast (_strip); if (track) { @@ -67,97 +174,203 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr s, lo_address a boost::shared_ptr rec_controllable = _strip->rec_enable_control (); if (rec_controllable) { rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/recenable"), _strip->rec_enable_control()), OSC::instance()); - send_change_message ("/strip/recenable", _strip->rec_enable_control()); + send_change_message (X_("/strip/recenable"), _strip->rec_enable_control()); } boost::shared_ptr recsafe_controllable = _strip->rec_safe_control (); if (rec_controllable) { recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/record_safe"), _strip->rec_safe_control()), OSC::instance()); - send_change_message ("/strip/record_safe", _strip->rec_safe_control()); + send_change_message (X_("/strip/record_safe"), _strip->rec_safe_control()); } _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_select_status, this, _1), OSC::instance()); send_select_status (ARDOUR::Properties::selected); } if (feedback[1]) { // level controls - boost::shared_ptr gain_cont = _strip->gain_control(); - if (gainmode) { - gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance()); - gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), gain_cont), OSC::instance()); - gain_automation ("/strip/fader"); - } else { - gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance()); - gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), gain_cont), OSC::instance()); - gain_automation ("/strip/gain"); - } + _gain_control = _strip->gain_control(); + _gain_control->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this), OSC::instance()); + _gain_control->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this), OSC::instance()); + gain_automation (); 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 (&OSCRouteObserver::send_trim_message, this, X_("/strip/trimdB"), _strip->trim_control()), OSC::instance()); - send_trim_message ("/strip/trimdB", _strip->trim_control()); + trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_trim_message, this), OSC::instance()); + send_trim_message (); } 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 (&OSCRouteObserver::send_change_message, this, X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance()); - send_change_message ("/strip/pan_stereo_position", _strip->pan_azimuth_control()); + send_change_message (X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control()); } } + _init = false; tick(); + } -OSCRouteObserver::~OSCRouteObserver () +void +OSCRouteObserver::refresh_send (boost::shared_ptr new_send, bool force) { + _init = true; + if (_tick_busy) { + Glib::usleep(100); // let tick finish + } + _last_gain =-1.0; + _last_trim =-1.0; + send_select_status (ARDOUR::Properties::selected); + + if ((new_send == _send) && !force) { + // no change don't send feedback + _init = false; + return; + } strip_connections.drop_connections (); - if (sur->no_clear) { - // some surfaces destroy their own strips and don't need the extra noise - lo_address_free (addr); + if (!_strip) { + // this strip is blank and should be cleared + clear_strip (); return; } + _send = new_send; + send_clear (); + _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::no_strip, this), OSC::instance()); + as = ARDOUR::Off; - // all strip buttons should be off and faders 0 and etc. - clear_strip ("/strip/expand", 0); if (feedback[0]) { // buttons are separate feedback - text_with_id ("/strip/name", ssid, " "); - clear_strip ("/strip/mute", 0); - clear_strip ("/strip/solo", 0); - clear_strip ("/strip/recenable", 0); - clear_strip ("/strip/record_safe", 0); - clear_strip ("/strip/monitor_input", 0); - clear_strip ("/strip/monitor_disk", 0); - clear_strip ("/strip/gui_select", 0); - clear_strip ("/strip/select", 0); + _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance()); + name_changed (ARDOUR::Properties::name); + } + + if (feedback[1]) { // level controls + _gain_control = _send->gain_control(); + _gain_control->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this), OSC::instance()); + _gain_control->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this), OSC::instance()); + gain_automation (); + + if (_send->pan_outs() > 1) { + boost::shared_ptr pan_controllable = boost::dynamic_pointer_cast(_send->panner_shell()->panner()->pannable()->pan_azimuth_control); + if (pan_controllable) { + pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/pan_stereo_position"), pan_controllable), OSC::instance()); + send_change_message (X_("/strip/pan_stereo_position"), pan_controllable); + } + } else { + _osc.float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, in_line, addr); + } + } + _init = false; + tick(); + +} + +void +OSCRouteObserver::set_expand (uint32_t expand) +{ + if (expand != _expand) { + _expand = expand; + if (expand == ssid) { + _osc.float_message_with_id (X_("/strip/expand"), ssid, 1.0, in_line, addr); + } else { + _osc.float_message_with_id (X_("/strip/expand"), ssid, 0.0, in_line, addr); + } + } +} + +void +OSCRouteObserver::set_link_ready (uint32_t not_ready) +{ + if (not_ready) { + clear_strip (); + switch (ssid) { + case 1: + _osc.text_message_with_id (X_("/strip/name"), ssid, "Device", in_line, addr); + break; + case 2: + _osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1", not_ready), in_line, addr); + break; + case 3: + _osc.text_message_with_id (X_("/strip/name"), ssid, "Missing", in_line, addr); + break; + case 4: + _osc.text_message_with_id (X_("/strip/name"), ssid, "from", in_line, addr); + break; + case 5: + _osc.text_message_with_id (X_("/strip/name"), ssid, "Linkset", in_line, addr); + break; + default: + break; + } + } else { + refresh_strip (_strip, true); + } +} + +void +OSCRouteObserver::clear_strip () +{ + send_clear (); + if (feedback[0]) { // buttons are separate feedback + _osc.text_message_with_id (X_("/strip/name"), ssid, " ", in_line, addr); } if (feedback[1]) { // level controls if (gainmode) { - clear_strip ("/strip/fader", 0); + _osc.float_message_with_id (X_("/strip/fader"), ssid, 0, in_line, addr); } else { - clear_strip ("/strip/gain", -193); + _osc.float_message_with_id (X_("/strip/gain"), ssid, -193, in_line, addr); } - clear_strip ("/strip/trimdB", 0); - clear_strip ("/strip/pan_stereo_position", 0.5); + _osc.float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, in_line, addr); + } +} + +void +OSCRouteObserver::send_clear () +{ + _init = true; + + strip_connections.drop_connections (); + + // all strip buttons should be off and faders 0 and etc. + _osc.float_message_with_id (X_("/strip/expand"), ssid, 0, in_line, addr); + if (feedback[0]) { // buttons are separate feedback + _osc.text_message_with_id (X_("/strip/group"), ssid, "none", in_line, addr); + _osc.float_message_with_id (X_("/strip/mute"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/solo"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/recenable"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/record_safe"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/monitor_input"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/gui_select"), ssid, 0, in_line, addr); + _osc.float_message_with_id (X_("/strip/select"), ssid, 0, in_line, addr); + } + if (feedback[1]) { // level controls + _osc.float_message_with_id (X_("/strip/trimdB"), ssid, 0, in_line, addr); } if (feedback[9]) { - clear_strip ("/strip/signal", 0); + _osc.float_message_with_id (X_("/strip/signal"), ssid, 0, in_line, addr); } if (feedback[7]) { if (gainmode) { - clear_strip ("/strip/meter", 0); + _osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr); } else { - clear_strip ("/strip/meter", -193); + _osc.float_message_with_id (X_("/strip/meter"), ssid, -193, in_line, addr); } }else if (feedback[8]) { - clear_strip ("/strip/meter", 0); + _osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr); } - - lo_address_free (addr); } + void OSCRouteObserver::tick () { + if (_init) { + return; + } + _tick_busy = true; if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled // the only meter here is master + /* XXXX need to add send meter for send mode or + * disable for send mode + */ float now_meter; if (_strip->peak_meter()) { now_meter = _strip->peak_meter()->meter_level(0, MeterMCP); @@ -167,44 +380,24 @@ OSCRouteObserver::tick () if (now_meter < -120) now_meter = -193; if (_last_meter != now_meter) { if (feedback[7] || feedback[8]) { - string path = "/strip/meter"; - lo_message msg = lo_message_new (); - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } if (gainmode && feedback[7]) { - lo_message_add_float (msg, ((now_meter + 94) / 100)); - lo_send_message (addr, path.c_str(), msg); + _osc.float_message_with_id (X_("/strip/meter"), ssid, ((now_meter + 94) / 100), in_line, addr); } else if ((!gainmode) && feedback[7]) { - lo_message_add_float (msg, now_meter); - lo_send_message (addr, path.c_str(), msg); + _osc.float_message_with_id (X_("/strip/meter"), ssid, now_meter, in_line, addr); } else if (feedback[8]) { uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1); uint16_t ledbits = ~(0xfff<name()); + name_changed (ARDOUR::Properties::name); } gain_timeout--; } - if (trim_timeout) { - if (trim_timeout == 1) { - text_with_id ("/strip/name", ssid, _strip->name()); - } - trim_timeout--; - } if (as == ARDOUR::Play || as == ARDOUR::Touch) { - if(_last_gain != _strip->gain_control()->get_value()) { - _last_gain = _strip->gain_control()->get_value(); - if (gainmode) { - send_gain_message ("/strip/fader", _strip->gain_control()); - } else { - send_gain_message ("/strip/gain", _strip->gain_control()); - } + if(_last_gain != _gain_control->get_value()) { + _last_gain = _gain_control->get_value(); + send_gain_message (); } } } - + _tick_busy = false; } void @@ -243,44 +426,45 @@ OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed) if (!what_changed.contains (ARDOUR::Properties::name)) { return; } + string name = ""; + if (!_send) { + name = _strip->name(); + } else { + name = string_compose ("%1-Send", _strip->name()); + } - if (!_strip) { - return; + if (_strip) { + _osc.text_message_with_id (X_("/strip/name"), ssid, name, in_line, addr); } - text_with_id ("/strip/name", ssid, _strip->name()); } void -OSCRouteObserver::send_change_message (string path, boost::shared_ptr controllable) +OSCRouteObserver::group_name () { - lo_message msg = lo_message_new (); + boost::shared_ptr rt = boost::dynamic_pointer_cast (_strip); - if (feedback[2]) { - path = set_path (path); + RouteGroup *rg = rt->route_group(); + if (rg) { + _osc.text_message_with_id (X_("/strip/group"), ssid, rg->name(), in_line, addr); } else { - lo_message_add_int32 (msg, ssid); + _osc.text_message_with_id (X_("/strip/group"), ssid, " ", in_line, addr); } - float val = controllable->get_value(); - lo_message_add_float (msg, (float) controllable->internal_to_interface (val)); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); } void -OSCRouteObserver::text_with_id (string path, uint32_t id, string name) +OSCRouteObserver::pi_changed (PBD::PropertyChange const& what_changed) { - lo_message msg = lo_message_new (); - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, id); + if (!what_changed.contains (ARDOUR::Properties::hidden)) { + return; } + _osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr); +} - lo_message_add_string (msg, name.c_str()); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); +void +OSCRouteObserver::send_change_message (string path, boost::shared_ptr controllable) +{ + float val = controllable->get_value(); + _osc.float_message_with_id (path, ssid, (float) controllable->internal_to_interface (val), in_line, addr); } void @@ -297,102 +481,66 @@ OSCRouteObserver::send_monitor_status (boost::shared_ptr controlla disk = 1; input = 0; break; + case 3: + disk = 1; + input = 1; + break; default: disk = 0; input = 0; } - - lo_message msg = lo_message_new (); - string path = "/strip/monitor_input"; - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } - lo_message_add_int32 (msg, (float) input); - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); - - msg = lo_message_new (); - path = "/strip/monitor_disk"; - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } - lo_message_add_int32 (msg, (float) disk); - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + _osc.int_message_with_id (X_("/strip/monitor_input"), ssid, input, in_line, addr); + _osc.int_message_with_id (X_("/strip/monitor_disk"), ssid, disk, in_line, addr); } void -OSCRouteObserver::send_trim_message (string path, boost::shared_ptr controllable) +OSCRouteObserver::send_trim_message () { - if (gainmode) { - text_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value()))); - trim_timeout = 8; - } - - lo_message msg = lo_message_new (); - - if (feedback[2]) { - path = set_path (path); + if (_last_trim != _strip->trim_control()->get_value()) { + _last_trim = _strip->trim_control()->get_value(); } else { - lo_message_add_int32 (msg, ssid); + return; } - - lo_message_add_float (msg, (float) accurate_coefficient_to_dB (controllable->get_value())); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + _osc.float_message_with_id (X_("/strip/trimdB"), ssid, (float) accurate_coefficient_to_dB (_last_trim), in_line, addr); } void -OSCRouteObserver::send_gain_message (string path, boost::shared_ptr controllable) +OSCRouteObserver::send_gain_message () { - lo_message msg = lo_message_new (); - - if (feedback[2]) { - path = set_path (path); + if (_last_gain != _gain_control->get_value()) { + _last_gain = _gain_control->get_value(); } else { - lo_message_add_int32 (msg, ssid); + return; } if (gainmode) { - lo_message_add_float (msg, controllable->internal_to_interface (controllable->get_value())); - text_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value()))); - gain_timeout = 8; - } else { - if (controllable->get_value() < 1e-15) { - lo_message_add_float (msg, -200); + _osc.float_message_with_id (X_("/strip/fader"), ssid, _gain_control->internal_to_interface (_last_gain), in_line, addr); + if (gainmode == 1) { + _osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (_last_gain)), in_line, addr); + gain_timeout = 8; + } + } + if (!gainmode || gainmode == 2) { + if (_last_gain < 1e-15) { + _osc.float_message_with_id (X_("/strip/gain"), ssid, -200, in_line, addr); } else { - lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value())); + _osc.float_message_with_id (X_("/strip/gain"), ssid, accurate_coefficient_to_dB (_last_gain), in_line, addr); } } - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); } void -OSCRouteObserver::gain_automation (string path) +OSCRouteObserver::gain_automation () { - lo_message msg = lo_message_new (); - string apath = string_compose ("%1/automation", path); - string npath = string_compose ("%1/automation_name", path); - - if (feedback[2]) { - apath = set_path (apath); - } else { - lo_message_add_int32 (msg, ssid); + string path = X_("/strip/gain"); + if (gainmode) { + path = X_("/strip/fader"); } - - boost::shared_ptr control = _strip->gain_control(); - send_gain_message (path, control); - as = control->alist()->automation_state(); + send_gain_message (); + as = _gain_control->alist()->automation_state(); string auto_name; - float output; + float output = 0; switch (as) { case ARDOUR::Off: output = 0; @@ -410,39 +558,15 @@ OSCRouteObserver::gain_automation (string path) output = 3; auto_name = "Touch"; break; + case ARDOUR::Latch: + output = 4; + auto_name = "Latch"; + break; default: break; } - - lo_message_add_float (msg, output); - lo_send_message (addr, apath.c_str(), msg); - lo_message_free (msg); - text_with_id (npath, ssid, auto_name); -} - -string -OSCRouteObserver::set_path (string path) -{ - if (feedback[2]) { - path = string_compose ("%1/%2", path, ssid); - } - return path; -} - -void -OSCRouteObserver::clear_strip (string path, float val) -{ - lo_message msg = lo_message_new (); - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } - lo_message_add_float (msg, val); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); - + _osc.float_message_with_id (string_compose (X_("%1/automation"), path), ssid, output, in_line, addr); + _osc.text_message_with_id (string_compose (X_("%1/automation_name"), path), ssid, auto_name, in_line, addr); } void @@ -450,17 +574,7 @@ OSCRouteObserver::send_select_status (const PropertyChange& what) { if (what == PropertyChange(ARDOUR::Properties::selected)) { if (_strip) { - string path = "/strip/select"; - - lo_message msg = lo_message_new (); - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } - lo_message_add_float (msg, _strip->is_selected()); - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + _osc.float_message_with_id (X_("/strip/select"), ssid, _strip->is_selected(), in_line, addr); } } }