From f65713c4262cbbf2fd531173d33b091e38cc2f27 Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Thu, 9 Jun 2016 18:33:00 -0700 Subject: OSC: Finished Select send levels --- libs/surfaces/osc/osc.cc | 34 ++++++++++++ libs/surfaces/osc/osc.h | 5 ++ libs/surfaces/osc/osc_select_observer.cc | 91 +++++++++++++++++--------------- libs/surfaces/osc/osc_select_observer.h | 12 ++--- 4 files changed, 93 insertions(+), 49 deletions(-) (limited to 'libs') diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 8713c25658..8d4c82c539 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -527,6 +527,8 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim); REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position); REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width); + REGISTER_CALLBACK (serv, "/select/send_gain", "if", sel_sendgain); + REGISTER_CALLBACK (serv, "/select/send_fader", "if", sel_sendfader); /* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these */ REGISTER_CALLBACK (serv, "/strip/mute", "ii", route_mute); @@ -886,6 +888,16 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ strip_gui_select (ssid, argv[0]->f == 1.0, msg); ret = 0; } + else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) { + int ssid = atoi (&path[18]); + route_mute (ssid, argv[0]->f == 1.0, msg); + ret = 0; + } + else if (!strncmp (path, "/select/send_fader/", 19) && strlen (path) > 19) { + int ssid = atoi (&path[19]); + route_solo (ssid, argv[0]->f == 1.0, msg); + ret = 0; + } } if ((ret && _debugmode == Unhandled)) { @@ -2011,6 +2023,28 @@ OSC::route_set_send_fader (int ssid, int sid, float pos, lo_message msg) return ret; } +int +OSC::sel_sendgain (int id, float val, lo_message msg) +{ + OSCSurface *sur = get_surface(lo_message_get_source (msg)); + if (sur->surface_sel) { + return route_set_send_gain_dB(sur->surface_sel, id, val, msg); + } else { + return route_send_fail ("send_gain", 0, -193, lo_message_get_source (msg)); + } +} + +int +OSC::sel_sendfader (int id, float val, lo_message msg) +{ + OSCSurface *sur = get_surface(lo_message_get_source (msg)); + if (sur->surface_sel) { + return route_set_send_fader(sur->surface_sel, id, val, msg); + } else { + return route_send_fail ("send_gain", 0, -193, lo_message_get_source (msg)); + } +} + int OSC::route_plugin_parameter (int ssid, int piid, int par, float val, lo_message msg) { diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 5b021bcda7..304c747af0 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -388,6 +388,9 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI return 0; \ } + PATH_CALLBACK2_MSG(sel_sendgain,i,f); + PATH_CALLBACK2_MSG(sel_sendfader,i,f); + PATH_CALLBACK4(set_surface,i,i,i,i); PATH_CALLBACK2(locate,i,i); PATH_CALLBACK2(loop_location,i,i); @@ -465,6 +468,8 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI int sel_trim (float val, lo_message msg); int sel_pan_position (float val, lo_message msg); int sel_pan_width (float val, lo_message msg); + int sel_sendgain (int id, float dB, lo_message msg); + int sel_sendfader (int id, float pos, lo_message msg); void listen_to_route (boost::shared_ptr, lo_address); void end_listen (boost::shared_ptr, lo_address); diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index 0c481ba247..3e675fb97b 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -49,63 +49,63 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr s, lo_address _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::name_changed, this, boost::lambda::_1), OSC::instance()); name_changed (ARDOUR::Properties::name); - _strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/mute"), _strip->mute_control()), OSC::instance()); - send_change_message ("/select/mute", _strip->mute_control()); + _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()); - _strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance()); - send_change_message ("/select/solo", _strip->solo_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()); boost::shared_ptr track = boost::dynamic_pointer_cast (_strip); if (track) { - track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_monitor_status, this, track->monitoring_control()), OSC::instance()); - send_monitor_status (track->monitoring_control()); + track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::monitor_status, this, track->monitoring_control()), OSC::instance()); + monitor_status (track->monitoring_control()); } boost::shared_ptr rec_controllable = _strip->rec_enable_control (); if (rec_controllable) { - rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/recenable"), _strip->rec_enable_control()), OSC::instance()); - send_change_message ("/select/recenable", _strip->rec_enable_control()); + 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()); } boost::shared_ptr recsafe_controllable = _strip->rec_safe_control (); if (recsafe_controllable) { - recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/record_safe"), _strip->rec_safe_control()), OSC::instance()); - send_change_message ("/select/record_safe", _strip->rec_safe_control()); + 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()); } boost::shared_ptr phase_controllable = _strip->phase_control (); if (phase_controllable) { - phase_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_change_message, this, X_("/select/polarity"), _strip->phase_control()), OSC::instance()); - send_change_message ("/select/polarity", _strip->phase_control()); + 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()); } } if (feedback[1]) { // level controls if (gainmode) { - _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain_message, this, X_("/select/fader"), _strip->gain_control()), OSC::instance()); - send_gain_message ("/select/fader", _strip->gain_control()); + _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/fader"), _strip->gain_control()), OSC::instance()); + gain_message ("/select/fader", _strip->gain_control()); } else { - _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain_message, this, X_("/select/gain"), _strip->gain_control()), OSC::instance()); - send_gain_message ("/select/gain", _strip->gain_control()); + _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::gain_message, this, X_("/select/gain"), _strip->gain_control()), OSC::instance()); + gain_message ("/select/gain", _strip->gain_control()); } 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::send_trim_message, this, X_("/select/trimdB"), _strip->trim_control()), OSC::instance()); - send_trim_message ("/select/trimdB", _strip->trim_control()); + 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()); } 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::send_change_message, this, X_("/select/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance()); - send_change_message ("/select/pan_stereo_position", _strip->pan_azimuth_control()); + 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()); } 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::send_change_message, this, X_("/select/pan_stereo_width"), _strip->pan_width_control()), OSC::instance()); - send_change_message ("/select/pan_stereo_width", _strip->pan_width_control()); + 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()); } // detecting processor changes requires cast to route @@ -171,8 +171,8 @@ OSCSelectObserver::send_init() do { sends = false; if (_strip->send_level_controllable (nsends)) { - _strip->send_level_controllable(nsends)->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain, this, X_("/select/send_gain"), nsends, _strip->send_level_controllable(nsends)), OSC::instance()); - send_gain ("/select/send_gain", nsends, _strip->send_level_controllable(nsends)); + _strip->send_level_controllable(nsends)->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_gain, this, nsends, _strip->send_level_controllable(nsends)), OSC::instance()); + send_gain (nsends, _strip->send_level_controllable(nsends)); sends = true; } @@ -192,10 +192,10 @@ OSCSelectObserver::send_init() lo_message_add_int32 (msg, 1); lo_send_message (addr, path.c_str(), msg); lo_message_free (msg); - } - + } + // this should get signalled by the route the send goes to, (TODO) if (sends) { // if the gain control is there, this is too - send_rename ("/select/send_name", nsends, _strip->send_name(nsends)); + send_name ("/select/send_name", nsends, _strip->send_name(nsends)); } // Send numbers are 0 based, OSC is 1 based so this gets incremented at the end if (sends) { @@ -331,7 +331,7 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed) } void -OSCSelectObserver::send_change_message (string path, boost::shared_ptr controllable) +OSCSelectObserver::change_message (string path, boost::shared_ptr controllable) { lo_message msg = lo_message_new (); @@ -342,7 +342,7 @@ OSCSelectObserver::send_change_message (string path, boost::shared_ptr controllable) +OSCSelectObserver::monitor_status (boost::shared_ptr controllable) { int disk, input; float val = controllable->get_value(); @@ -375,7 +375,7 @@ OSCSelectObserver::send_monitor_status (boost::shared_ptr controll } void -OSCSelectObserver::send_trim_message (string path, boost::shared_ptr controllable) +OSCSelectObserver::trim_message (string path, boost::shared_ptr controllable) { lo_message msg = lo_message_new (); @@ -386,7 +386,7 @@ OSCSelectObserver::send_trim_message (string path, boost::shared_ptr controllable) +OSCSelectObserver::gain_message (string path, boost::shared_ptr controllable) { lo_message msg = lo_message_new (); @@ -409,30 +409,35 @@ OSCSelectObserver::send_gain_message (string path, boost::shared_ptr controllable) +OSCSelectObserver::send_gain (uint32_t id, boost::shared_ptr controllable) { lo_message msg = lo_message_new (); - - if (feedback[2]) { - path = set_path (path, id + 1); - } else { - lo_message_add_int32 (msg, id + 1); - } + string path; + float value; if (gainmode) { + path = "/select/send_fader"; if (controllable->get_value() == 1) { - lo_message_add_int32 (msg, 800); + value = 800; } else { - lo_message_add_int32 (msg, gain_to_slider_position (controllable->get_value()) * 1023); + value = gain_to_slider_position (controllable->get_value()); } } else { + path = "/select/send_gain"; if (controllable->get_value() < 1e-15) { - lo_message_add_float (msg, -200); + value = -193; } else { - lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value())); + value = accurate_coefficient_to_dB (controllable->get_value()); } } + if (feedback[2]) { + path = set_path (path, id + 1); + } else { + lo_message_add_int32 (msg, id + 1); + } + + lo_message_add_float (msg, value); lo_send_message (addr, path.c_str(), msg); lo_message_free (msg); } @@ -454,7 +459,7 @@ OSCSelectObserver::send_enable (string path, uint32_t id, boost::shared_ptr controllable); - void send_monitor_status (boost::shared_ptr controllable); - void send_gain_message (std::string path, boost::shared_ptr controllable); - void send_trim_message (std::string path, boost::shared_ptr controllable); + void change_message (std::string path, boost::shared_ptr controllable); + void monitor_status (boost::shared_ptr controllable); + void gain_message (std::string path, boost::shared_ptr controllable); + void trim_message (std::string path, boost::shared_ptr controllable); // sends stuff void send_init (void); void send_end (void); void send_restart (int); - void send_gain (std::string path, uint32_t id, boost::shared_ptr controllable); + void send_gain (uint32_t id, boost::shared_ptr controllable); void send_enable (std::string path, uint32_t id, boost::shared_ptr controllable); - void send_rename (std::string path, uint32_t id, std::string name); + void send_name (std::string path, uint32_t id, std::string name); std::string set_path (std::string path, uint32_t id); void clear_strip (std::string path, float val); }; -- cgit v1.2.3