X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc_route_observer.cc;h=e22444e4c557695928a6b177c34cce4263b2dee0;hb=5ae72d574c27bfb4412ba8161918fb3c5d5745db;hp=ff80dbe781063e206a3e45c82c43311682dd8fc2;hpb=9ff3c55e34a9303ea1530aec7f48c27dbfc370f2;p=ardour.git diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc index ff80dbe781..e22444e4c5 100644 --- a/libs/surfaces/osc/osc_route_observer.cc +++ b/libs/surfaces/osc/osc_route_observer.cc @@ -28,7 +28,7 @@ #include "osc.h" #include "osc_route_observer.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -55,8 +55,8 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr s, lo_address a boost::shared_ptr track = boost::dynamic_pointer_cast (_strip); if (track) { - track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_monitor_status, this, track->monitoring_control()), OSC::instance()); - send_monitor_status (track->monitoring_control()); + track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_monitor_status, this, track->monitoring_control()), OSC::instance()); + send_monitor_status (track->monitoring_control()); } boost::shared_ptr rec_controllable = _strip->rec_enable_control (); @@ -69,6 +69,8 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr s, lo_address a recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, 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()); } + _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_select_status, this, _1), OSC::instance()); + send_select_status (ARDOUR::Properties::selected); } if (feedback[1]) { // level controls @@ -100,25 +102,17 @@ OSCRouteObserver::~OSCRouteObserver () strip_connections.drop_connections (); // all strip buttons should be off and faders 0 and etc. + clear_strip ("/strip/expand", 0); if (feedback[0]) { // buttons are separate feedback - lo_message msg = lo_message_new (); - // name is a string do it first - string path = "/strip/name"; - if (feedback[2]) { - path = set_path (path); - } else { - lo_message_add_int32 (msg, ssid); - } - lo_message_add_string (msg, " "); - - lo_send_message (addr, path.c_str(), msg); - lo_message_free (msg); + 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); } if (feedback[1]) { // level controls if (gainmode) { @@ -150,8 +144,13 @@ OSCRouteObserver::tick () { if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled // the only meter here is master - float now_meter = _strip->peak_meter()->meter_level(0, MeterMCP); - if (now_meter < -193) now_meter = -193; + float now_meter; + if (_strip->peak_meter()) { + now_meter = _strip->peak_meter()->meter_level(0, MeterMCP); + } else { + now_meter = -193; + } + if (now_meter < -120) now_meter = -193; if (_last_meter != now_meter) { if (feedback[7] || feedback[8]) { string path = "/strip/meter"; @@ -162,8 +161,7 @@ OSCRouteObserver::tick () lo_message_add_int32 (msg, ssid); } if (gainmode && feedback[7]) { - uint32_t lev1023 = (uint32_t)((now_meter + 54) * 17.05); - lo_message_add_int32 (msg, lev1023); + lo_message_add_float (msg, ((now_meter + 94) / 100)); lo_send_message (addr, path.c_str(), msg); } else if ((!gainmode) && feedback[7]) { lo_message_add_float (msg, now_meter); @@ -198,6 +196,20 @@ OSCRouteObserver::tick () _last_meter = now_meter; } + if (feedback[1]) { + if (gain_timeout) { + if (gain_timeout == 1) { + text_with_id ("/strip/name", ssid, _strip->name()); + } + gain_timeout--; + } + if (trim_timeout) { + if (trim_timeout == 1) { + text_with_id ("/strip/name", ssid, _strip->name()); + } + trim_timeout--; + } + } } @@ -211,34 +223,37 @@ OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed) if (!_strip) { return; } + text_with_id ("/strip/name", ssid, _strip->name()); +} +void +OSCRouteObserver::send_change_message (string path, boost::shared_ptr controllable) +{ lo_message msg = lo_message_new (); - // ssid is the strip on the surface this observer refers to - // not part of the internal ordering. - string path = "/strip/name"; if (feedback[2]) { path = set_path (path); } else { lo_message_add_int32 (msg, ssid); } - lo_message_add_string (msg, _strip->name().c_str()); + 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::send_change_message (string path, boost::shared_ptr controllable) +OSCRouteObserver::text_with_id (string path, uint32_t id, string name) { lo_message msg = lo_message_new (); - if (feedback[2]) { path = set_path (path); } else { - lo_message_add_int32 (msg, ssid); + lo_message_add_int32 (msg, id); } - lo_message_add_float (msg, (float) controllable->get_value()); + + lo_message_add_string (msg, name.c_str()); lo_send_message (addr, path.c_str(), msg); lo_message_free (msg); @@ -290,6 +305,11 @@ OSCRouteObserver::send_monitor_status (boost::shared_ptr controlla void OSCRouteObserver::send_trim_message (string path, boost::shared_ptr controllable) { + 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]) { @@ -316,11 +336,9 @@ OSCRouteObserver::send_gain_message (string path, boost::shared_ptrget_value() == 1) { - lo_message_add_int32 (msg, 800); - } else { - lo_message_add_int32 (msg, gain_to_slider_position (controllable->get_value()) * 1023); - } + lo_message_add_float (msg, gain_to_slider_position (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); @@ -337,9 +355,7 @@ string OSCRouteObserver::set_path (string path) { if (feedback[2]) { - ostringstream os; - os << path << "/" << ssid; - path = os.str(); + path = string_compose ("%1/%2", path, ssid); } return path; } @@ -359,3 +375,23 @@ OSCRouteObserver::clear_strip (string path, float val) lo_message_free (msg); } + +void +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); + } + } +}