X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.cc;h=5f757b9105b60c2e19cd72a875b10fe5009d2287;hb=2a809dcf7005ab91bc297ef88365822728c06c56;hp=2553499ad15c9c55efc8486895cd943f450a11c4;hpb=f3f18168995b7d22dfa6589b12e61b72903faa56;p=ardour.git diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 2553499ad1..5f757b9105 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -28,6 +28,7 @@ #include "pbd/gstdio_compat.h" #include +#include "pbd/control_math.h" #include #include #include @@ -45,6 +46,7 @@ #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/presentation_info.h" +#include "ardour/profile.h" #include "ardour/send.h" #include "ardour/internal_send.h" #include "ardour/phase_control.h" @@ -98,6 +100,8 @@ OSC::OSC (Session& s, uint32_t port) , default_strip (159) , default_feedback (0) , default_gainmode (0) + , default_send_size (0) + , default_plugin_size (0) , tick (true) , bank_dirty (false) , scrub_speed (0) @@ -328,6 +332,7 @@ OSC::stop () periodic_connection.disconnect (); session_connections.drop_connections (); cueobserver_connections.drop_connections (); + Glib::Threads::Mutex::Lock lm (surfaces_lock); // Delete any active route observers for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) { @@ -401,14 +406,10 @@ OSC::register_callbacks() // Some controls have optional "f" for feedback or touchosc // http://hexler.net/docs/touchosc-controls-reference - REGISTER_CALLBACK (serv, "/set_surface", "iiii", set_surface); - REGISTER_CALLBACK (serv, "/set_surface/feedback", "i", set_surface_feedback); - REGISTER_CALLBACK (serv, "/set_surface/bank_size", "i", set_surface_bank_size); - REGISTER_CALLBACK (serv, "/set_surface/gainmode", "i", set_surface_gainmode); - REGISTER_CALLBACK (serv, "/set_surface/strip_types", "i", set_surface_strip_types); REGISTER_CALLBACK (serv, "/refresh", "", refresh_surface); REGISTER_CALLBACK (serv, "/refresh", "f", refresh_surface); REGISTER_CALLBACK (serv, "/strip/list", "", routes_list); + REGISTER_CALLBACK (serv, "/strip/list", "f", routes_list); REGISTER_CALLBACK (serv, "/add_marker", "", add_marker); REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker); REGISTER_CALLBACK (serv, "/access_action", "s", access_action); @@ -530,18 +531,20 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "f", scroll_dn_1_page); REGISTER_CALLBACK (serv, "/scroll_dn_1_page", "", scroll_dn_1_page); REGISTER_CALLBACK (serv, "/bank_up", "", bank_up); - REGISTER_CALLBACK (serv, "/bank_up", "f", bank_up); + REGISTER_CALLBACK (serv, "/bank_up", "f", bank_delta); REGISTER_CALLBACK (serv, "/bank_down", "", bank_down); REGISTER_CALLBACK (serv, "/bank_down", "f", bank_down); // controls for "special" strips REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain); REGISTER_CALLBACK (serv, "/master/fader", "f", master_set_fader); + REGISTER_CALLBACK (serv, "/master/db_delta", "f", master_delta_gain); REGISTER_CALLBACK (serv, "/master/mute", "i", master_set_mute); REGISTER_CALLBACK (serv, "/master/trimdB", "f", master_set_trim); REGISTER_CALLBACK (serv, "/master/pan_stereo_position", "f", master_set_pan_stereo_position); REGISTER_CALLBACK (serv, "/monitor/gain", "f", monitor_set_gain); REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader); + REGISTER_CALLBACK (serv, "/monitor/db_delta", "f", monitor_delta_gain); REGISTER_CALLBACK (serv, "/monitor/mute", "i", monitor_set_mute); REGISTER_CALLBACK (serv, "/monitor/dim", "i", monitor_set_dim); REGISTER_CALLBACK (serv, "/monitor/mono", "i", monitor_set_mono); @@ -558,12 +561,17 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase); REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain); REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader); + REGISTER_CALLBACK (serv, "/select/db_delta", "f", sel_dB_delta); 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); REGISTER_CALLBACK (serv, "/select/send_enable", "if", sel_sendenable); + REGISTER_CALLBACK (serv, "/select/master_send_enable", "i", sel_master_send_enable); + REGISTER_CALLBACK (serv, "/select/send_page", "f", sel_send_page); + REGISTER_CALLBACK (serv, "/select/plug_page", "f", sel_plug_page); + REGISTER_CALLBACK (serv, "/select/plugin", "f", sel_plugin); REGISTER_CALLBACK (serv, "/select/expand", "i", sel_expand); REGISTER_CALLBACK (serv, "/select/pan_elevation_position", "f", sel_pan_elevation); REGISTER_CALLBACK (serv, "/select/pan_frontback_position", "f", sel_pan_frontback); @@ -574,13 +582,18 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/select/comp_mode", "f", sel_comp_mode); REGISTER_CALLBACK (serv, "/select/comp_makeup", "f", sel_comp_makeup); REGISTER_CALLBACK (serv, "/select/eq_enable", "f", sel_eq_enable); - REGISTER_CALLBACK (serv, "/select/eq_hpf", "f", sel_eq_hpf); + REGISTER_CALLBACK (serv, "/select/eq_hpf/freq", "f", sel_eq_hpf_freq); + REGISTER_CALLBACK (serv, "/select/eq_hpf/enable", "f", sel_eq_hpf_enable); + REGISTER_CALLBACK (serv, "/select/eq_hpf/slope", "f", sel_eq_hpf_slope); + REGISTER_CALLBACK (serv, "/select/eq_lpf/freq", "f", sel_eq_lpf_freq); + REGISTER_CALLBACK (serv, "/select/eq_lpf/enable", "f", sel_eq_lpf_enable); + REGISTER_CALLBACK (serv, "/select/eq_lpf/slope", "f", sel_eq_lpf_slope); REGISTER_CALLBACK (serv, "/select/eq_gain", "if", sel_eq_gain); REGISTER_CALLBACK (serv, "/select/eq_freq", "if", sel_eq_freq); REGISTER_CALLBACK (serv, "/select/eq_q", "if", sel_eq_q); REGISTER_CALLBACK (serv, "/select/eq_shape", "if", sel_eq_shape); - /* These commands require the route index in addition to the arg; TouchOSC (et al) can't use these */ + /* 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); REGISTER_CALLBACK (serv, "/strip/solo", "ii", route_solo); REGISTER_CALLBACK (serv, "/strip/solo_iso", "ii", route_solo_iso); @@ -607,7 +620,7 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/strip/send/enable", "iif", route_set_send_enable); REGISTER_CALLBACK(serv, "/strip/name", "is", route_rename); REGISTER_CALLBACK(serv, "/strip/sends", "i", route_get_sends); - REGISTER_CALLBACK(serv, "/strip/receives", "i", route_get_receives); + REGISTER_CALLBACK(serv, "/strip/receives", "i", route_get_receives); REGISTER_CALLBACK(serv, "/strip/plugin/list", "i", route_plugin_list); REGISTER_CALLBACK(serv, "/strip/plugin/descriptor", "ii", route_plugin_descriptor); REGISTER_CALLBACK(serv, "/strip/plugin/reset", "ii", route_plugin_reset); @@ -835,8 +848,13 @@ OSC::send_current_value (const char* path, lo_arg** argv, int argc, lo_message m } } } + OSCSurface *sur = get_surface(get_address (msg)); - lo_send_message (get_address (msg), "#reply", reply); + if (sur->feedback[14]) { + lo_send_message (get_address (msg), "/reply", reply); + } else { + lo_send_message (get_address (msg), "#reply", reply); + } lo_message_free (reply); } @@ -858,9 +876,14 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ /* 15 for /#current_value plus 2 for / */ len = strlen (path); + OSCSurface *sur = get_surface(get_address (msg)); if (strstr (path, "/automation")) { - ret = set_automation (path, argv, argc, msg); + ret = set_automation (path, types, argv, argc, msg); + + } else + if (strstr (path, "/touch")) { + ret = touch_detect (path, types, argv, argc, msg); } else if (len >= 17 && !strcmp (&path[len-15], "/#current_value")) { @@ -872,6 +895,11 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ ret = cue_parse (path, types, argv, argc, msg); + } else + if (!strncmp (path, "/select/plugin/parameter", 24)) { + + ret = select_plugin_parameter (path, types, argv, argc, msg); + } else if (!strncmp (path, "/access_action/", 15)) { check_surface (msg); @@ -909,7 +937,11 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ } } - lo_send_message (get_address (msg), "#reply", reply); + if (sur->feedback[14]) { + lo_send_message (get_address (msg), "/reply", reply); + } else { + lo_send_message (get_address (msg), "#reply", reply); + } lo_message_free (reply); ret = 0; @@ -939,6 +971,30 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ int ssid = atoi (&path[13]); ret = route_set_gain_fader (ssid, argv[0]->f, msg); } + else if (!strncmp (path, "/strip/db_delta", 15)) { + // in db delta + int ssid; + int ar_off = 0; + float delta; + if (strlen (path) > 15 && argc == 1) { + ssid = atoi (&path[16]); + } else if (argc == 2) { + if (types[0] == 'f') { + ssid = (int) argv[0]->f; + } else { + ssid = argv[0]->i; + } + ar_off = 1; + } else { + return -1; + } + if (types[ar_off] == 'f') { + delta = argv[ar_off]->f; + } else { + delta = (float) argv[ar_off]->i; + } + ret = strip_db_delta (ssid, delta, msg); + } else if (!strncmp (path, "/strip/trimdB/", 14) && strlen (path) > 14) { int ssid = atoi (&path[14]); ret = route_set_trim_dB (ssid, argv[0]->f, msg); @@ -1007,6 +1063,9 @@ OSC::catchall (const char *path, const char* types, lo_arg **argv, int argc, lo_ int ssid = atoi (&path[17]); ret = sel_eq_shape (ssid, argv[0]->f, msg); } + else if (!strncmp (path, "/set_surface", 12)) { + ret = surface_parse (path, types, argv, argc, msg); + } if (ret) { check_surface (msg); } @@ -1194,6 +1253,10 @@ OSC::routes_list (lo_message msg) lo_message_add_string (reply, "MB"); } else if (s->presentation_info().flags() & PresentationInfo::VCA) { lo_message_add_string (reply, "V"); + } else if (s->is_master()) { + lo_message_add_string (reply, "MA"); + } else if (s->is_monitor()) { + lo_message_add_string (reply, "MO"); } lo_message_add_string (reply, s->name().c_str()); @@ -1224,7 +1287,11 @@ OSC::routes_list (lo_message msg) //Automatically listen to stripables listed listen_to_route(s, get_address (msg)); - lo_send_message (get_address (msg), "#reply", reply); + if (sur->feedback[14]) { + lo_send_message (get_address (msg), "/reply", reply); + } else { + lo_send_message (get_address (msg), "#reply", reply); + } lo_message_free (reply); } } @@ -1242,7 +1309,11 @@ OSC::routes_list (lo_message msg) lo_message_add_int32 (reply, 0); } - lo_send_message (get_address (msg), "#reply", reply); + if (sur->feedback[14]) { + lo_send_message (get_address (msg), "/reply", reply); + } else { + lo_send_message (get_address (msg), "#reply", reply); + } lo_message_free (reply); } @@ -1270,20 +1341,18 @@ OSC::get_address (lo_message msg) int OSC::refresh_surface (lo_message msg) { - if (address_only) { - // get rid of all surfaces and observers. - // needs change to only clear those for this address on all ports - clear_devices(); - } OSCSurface *s = get_surface(get_address (msg)); // restart all observers - set_surface (s->bank_size, (uint32_t) s->strip_types.to_ulong(), (uint32_t) s->feedback.to_ulong(), (uint32_t) s->gainmode, msg); + set_surface (s->bank_size, (uint32_t) s->strip_types.to_ulong(), (uint32_t) s->feedback.to_ulong(), \ + (uint32_t) s->gainmode, (uint32_t) s->send_page_size, (uint32_t) s->plug_page_size, msg); return 0; } void OSC::clear_devices () { + tick = false; + Glib::Threads::Mutex::Lock lm (surfaces_lock); for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) { OSCRouteObserver* rc; @@ -1330,20 +1399,200 @@ OSC::clear_devices () // clear out surfaces _surface.clear(); + tick = true; } int -OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, lo_message msg) +OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) +{ + int ret = 1; /* unhandled */ + OSCSurface *sur = get_surface(get_address (msg)); + int pi_page = sur->plug_page_size; + int se_page = sur->send_page_size; + int fadermode = sur->gainmode; + int feedback = sur->feedback.to_ulong(); + int strip_types = sur->strip_types.to_ulong(); + int bank_size = sur->bank_size; + + + if (!strncmp (path, "/set_surface/feedback", 21)) { + if (types[0] == 'f') { + ret = set_surface_feedback ((int)argv[0]->f, msg); + } else { + ret = set_surface_feedback (argv[0]->i, msg); + } + } + else if (!strncmp (path, "/set_surface/bank_size", 22)) { + if (types[0] == 'f') { + ret = set_surface_bank_size ((int)argv[0]->f, msg); + } else { + ret = set_surface_bank_size (argv[0]->i, msg); + } + } + else if (!strncmp (path, "/set_surface/gainmode", 21)) { + if (types[0] == 'f') { + ret = set_surface_gainmode ((int)argv[0]->f, msg); + } else { + ret = set_surface_gainmode (argv[0]->i, msg); + } + } + else if (!strncmp (path, "/set_surface/strip_types", 24)) { + if (types[0] == 'f') { + ret = set_surface_strip_types ((int)argv[0]->f, msg); + } else { + ret = set_surface_strip_types (argv[0]->i, msg); + } + } + else if (!strncmp (path, "/set_surface/send_page_size", 27)) { + if (types[0] == 'f') { + ret = sel_send_pagesize ((int)argv[0]->f, msg); + } else { + ret = sel_send_pagesize (argv[0]->i, msg); + } + } + else if (!strncmp (path, "/set_surface/plugin_page_size", 29)) { + if (types[0] == 'f') { + ret = sel_plug_pagesize ((int)argv[0]->f, msg); + } else { + ret = sel_plug_pagesize (argv[0]->i, msg); + } + } else if (strlen(path) == 12) { + + // command is in /set_surface iii form + switch (argc) { + case 6: + if (types[5] == 'f') { + pi_page = (int) argv[5]->f; + } else { + pi_page = argv[5]->i; + } + case 5: + if (types[4] == 'f') { + se_page = (int) argv[4]->f; + } else { + se_page = argv[4]->i; + } + case 4: + if (types[3] == 'f') { + fadermode = (int) argv[3]->f; + } else { + fadermode = argv[3]->i; + } + case 3: + if (types[2] == 'f') { + feedback = (int) argv[2]->f; + } else { + feedback = argv[2]->i; + } + case 2: + if (types[1] == 'f') { + strip_types = (int) argv[1]->f; + } else { + strip_types = argv[1]->i; + } + case 1: + if (types[0] == 'f') { + bank_size = (int) argv[0]->f; + } else { + bank_size = argv[0]->i; + } + ret = set_surface (bank_size, strip_types, feedback, fadermode, se_page, pi_page, msg); + break; + case 0: + // send current setup + { + lo_message reply = lo_message_new (); + lo_message_add_int32 (reply, bank_size); + lo_message_add_int32 (reply, strip_types); + lo_message_add_int32 (reply, feedback); + lo_message_add_int32 (reply, fadermode); + lo_message_add_int32 (reply, se_page); + lo_message_add_int32 (reply, pi_page); + lo_send_message (get_address (msg), "/set_surface", reply); + lo_message_free (reply); + return 0; + } + break; + + default: + PBD::warning << "OSC: Too many parameters." << endmsg; + return 1; + break; + } + } else if (isdigit(path[13])) { + // some of our parameters must be "in-lined" + bank_size = atoi (&path[13]); + const char * par = strstr (&path[13], "/"); + if (par) { + strip_types = atoi (&par[1]); + const char * fb = strstr (&par[1], "/"); + if (fb) { + feedback = atoi (&fb[1]); + const char * fm = strstr (&fb[1], "/"); + if (fm) { + fadermode = atoi (&fm[1]); + const char * sp = strstr (&fm[1], "/"); + if (sp) { + se_page = atoi (&sp[1]); + const char * pp = strstr (&sp[1], "/"); + if (pp) { + pi_page = atoi (&pp[1]); + } else { + if (types[0] == 'f') { + pi_page = (int) argv[0]->f; + } else if (types[0] == 'i') { + pi_page = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + se_page = (int) argv[0]->f; + } else if (types[0] == 'i') { + se_page = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + fadermode = (int) argv[0]->f; + } else if (types[0] == 'i') { + fadermode = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + feedback = (int) argv[0]->f; + } else if (types[0] == 'i') { + feedback = argv[0]->i; + } + } + } else { + if (types[0] == 'f') { + strip_types = (int) argv[0]->f; + } else if (types[0] == 'i') { + strip_types = argv[0]->i; + } + } + ret = set_surface (bank_size, strip_types, feedback, fadermode, se_page, pi_page, msg); + } + return ret; +} + +int +OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, uint32_t se_size, uint32_t pi_size, lo_message msg) { OSCSurface *s = get_surface(get_address (msg)); s->bank_size = b_size; s->strip_types = strips; s->feedback = fb; s->gainmode = gm; + s->send_page_size = se_size; + s->plug_page_size = pi_size; // set bank and strip feedback set_bank(s->bank, msg); global_feedback (s->feedback, get_address (msg), s->gainmode); + sel_send_pagesize (se_size, msg); + sel_plug_pagesize (pi_size, msg); return 0; } @@ -1384,7 +1633,6 @@ OSC::set_surface_feedback (uint32_t fb, lo_message msg) return 0; } - int OSC::set_surface_gainmode (uint32_t gm, lo_message msg) { @@ -1423,17 +1671,15 @@ OSC::get_surface (lo_address addr) rurl = lo_address_get_url (addr); r_url = rurl; free (rurl); - for (uint32_t it = 0; it < _surface.size(); ++it) { - //find setup for this server - if (!_surface[it].remote_url.find(r_url)){ - return &_surface[it]; + { + Glib::Threads::Mutex::Lock lm (surfaces_lock); + for (uint32_t it = 0; it < _surface.size(); ++it) { + //find setup for this server + if (!_surface[it].remote_url.find(r_url)){ + return &_surface[it]; + } } } - // if we do this when OSC is started we get the wrong stripable - // we don't need this until we actually have a surface to deal with - if (!_select || (_select != ControlProtocol::first_selected_stripable())) { - gui_selection_changed(); - } // No surface create one with default values OSCSurface s; @@ -1451,9 +1697,21 @@ OSC::get_surface (lo_address addr) s.cue = false; s.aux = 0; s.strips = get_sorted_stripables(s.strip_types, s.cue); + s.send_page = 1; + s.send_page_size = default_send_size; + s.plug_page = 1; + s.plug_page_size = default_plugin_size; + s.plugin_id = 1; s.nstrips = s.strips.size(); - _surface.push_back (s); + { + Glib::Threads::Mutex::Lock lm (surfaces_lock); + _surface.push_back (s); + } + // moved this down here as selection may need s. set + if (!_select || (_select != ControlProtocol::first_selected_stripable())) { + gui_selection_changed(); + } // set bank and strip feedback _set_bank(s.bank, addr); @@ -1624,7 +1882,7 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr) } } // slow devices need time to clear buffers - usleep ((uint32_t) 10); + usleep ((uint32_t) 20); } } // light bankup or bankdown buttons if it is possible to bank in that direction @@ -1663,6 +1921,23 @@ OSC::bank_up (lo_message msg) return 0; } +int +OSC::bank_delta (float delta, lo_message msg) +{ + if (!session) { + return -1; + } + OSCSurface *s = get_surface(get_address (msg)); + uint32_t new_bank = s->bank + (s->bank_size * (int) delta); + if ((int)new_bank < 1) { + new_bank = 1; + } + if (new_bank != s->bank) { + set_bank (new_bank, msg); + } + return 0; +} + int OSC::bank_down (lo_message msg) { @@ -1717,6 +1992,141 @@ OSC::get_strip (uint32_t ssid, lo_address addr) return boost::shared_ptr(); } +// send and plugin paging commands +int +OSC::sel_send_pagesize (uint32_t size, lo_message msg) +{ + OSCSurface *s = get_surface(get_address (msg)); + if (size != s->send_page_size) { + s->send_page_size = size; + s->sel_obs->renew_sends(); + } + return 0; +} + +int +OSC::sel_send_page (int page, lo_message msg) +{ + OSCSurface *s = get_surface(get_address (msg)); + s->send_page = s->send_page + page; + s->sel_obs->renew_sends(); + return 0; +} + +int +OSC::sel_plug_pagesize (uint32_t size, lo_message msg) +{ + OSCSurface *s = get_surface(get_address (msg)); + if (size != s->plug_page_size) { + s->plug_page_size = size; + s->sel_obs->renew_plugin(); + } + return 0; +} + +int +OSC::sel_plug_page (int page, lo_message msg) +{ + OSCSurface *s = get_surface(get_address (msg)); + s->plug_page = s->plug_page + page; + s->sel_obs->renew_plugin(); + return 0; +} + +int +OSC::sel_plugin (int delta, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + return _sel_plugin (sur->plugin_id + delta, get_address (msg)); +} + +int +OSC::_sel_plugin (int id, lo_address addr) +{ + OSCSurface *sur = get_surface(addr); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, addr); + } else { + s = _select; + } + if (s) { + boost::shared_ptr r = boost::dynamic_pointer_cast(s); + if (!r) { + return 1; + } + + // find out how many plugins we have + bool plugs; + int nplugs = 0; + sur->plugins.clear(); + do { + plugs = false; + if (r->nth_plugin (nplugs)) { + if (r->nth_plugin(nplugs)->display_to_user()) { +#ifdef MIXBUS + // need to check for mixbus channel strips (and exclude them) + boost::shared_ptr proc = r->nth_plugin (nplugs); + boost::shared_ptr pi; + if ((pi = boost::dynamic_pointer_cast(proc))) { + + if (!pi->is_channelstrip()) { +#endif + sur->plugins.push_back (nplugs); +#ifdef MIXBUS + } + } +#endif + } + plugs = true; + nplugs++; + } + } while (plugs); + + // limit plugin_id to actual plugins + if (!sur->plugins.size()) { + sur->plugin_id = 0; + return 0; + } else if (sur->plugins.size() < (uint32_t) id) { + sur->plugin_id = sur->plugins.size(); + } else if (sur->plugins.size() && !id) { + sur->plugin_id = 1; + } else { + sur->plugin_id = id; + } + + // 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 pi; + if (!(pi = boost::dynamic_pointer_cast(proc))) { + PBD::warning << "OSC: Plugin: " << sur->plugin_id << " does not seem to be a plugin" << endmsg; + return 1; + } + boost::shared_ptr pip = pi->plugin(); + bool ok = false; + // put only input controls into a vector + sur->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)) { + sur->plug_params.push_back (ppi); + } + } + + sur->plug_page = 1; + + if (sur->sel_obs) { + sur->sel_obs->renew_plugin(); + } + return 0; + } + return 1; +} + void OSC::transport_frame (lo_message msg) { @@ -1949,7 +2359,33 @@ OSC::master_set_gain (float dB) if (dB < -192) { s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); } else { - s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup); + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + } + } + return 0; +} + +int +OSC::master_delta_gain (float delta) +{ + if (!session) return -1; + boost::shared_ptr s = session->master_out(); + if (s) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + if (dB < -192) { + s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); + } else { + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); } } return 0; @@ -1961,7 +2397,7 @@ OSC::master_set_fader (float position) if (!session) return -1; boost::shared_ptr s = session->master_out(); if (s) { - s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup); + s->gain_control()->set_value (s->gain_control()->interface_to_internal (position), PBD::Controllable::NoGroup); } return 0; } @@ -2030,7 +2466,33 @@ OSC::monitor_set_gain (float dB) if (dB < -192) { s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); } else { - s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup); + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + } + } + return 0; +} + +int +OSC::monitor_delta_gain (float delta) +{ + if (!session) return -1; + boost::shared_ptr s = session->monitor_out(); + if (s) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + if (dB < -192) { + s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup); + } else { + float abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); } } return 0; @@ -2042,7 +2504,7 @@ OSC::monitor_set_fader (float position) if (!session) return -1; boost::shared_ptr s = session->monitor_out(); if (s) { - s->gain_control()->set_value (slider_position_to_gain_with_max (position, 2.0), PBD::Controllable::NoGroup); + s->gain_control()->set_value (s->gain_control()->interface_to_internal (position), PBD::Controllable::NoGroup); } return 0; } @@ -2120,7 +2582,7 @@ OSC::route_get_sends(lo_message msg) { lo_message_add_string(reply, isend->name().c_str()); lo_message_add_int32(reply, i); boost::shared_ptr a = isend->amp(); - lo_message_add_float(reply, gain_to_slider_position(a->gain_control()->get_value())); + lo_message_add_float(reply, a->gain_control()->internal_to_interface (a->gain_control()->get_value())); lo_message_add_int32(reply, p->active() ? 1 : 0); } } @@ -2180,7 +2642,7 @@ OSC::route_get_receives(lo_message msg) { lo_message_add_int32(reply, get_sid(tr, get_address(msg))); lo_message_add_string(reply, tr->name().c_str()); lo_message_add_int32(reply, j); - lo_message_add_float(reply, gain_to_slider_position(a->gain_control()->get_value())); + lo_message_add_float(reply, a->gain_control()->internal_to_interface (a->gain_control()->get_value())); lo_message_add_int32(reply, p->active() ? 1 : 0); } } @@ -2197,7 +2659,7 @@ OSC::route_get_receives(lo_message msg) { // strip calls int -OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg) +OSC::set_automation (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) { if (!session) return -1; @@ -2206,25 +2668,29 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg) boost::shared_ptr strp = boost::shared_ptr(); uint32_t ctr = 0; uint32_t aut = 0; + uint32_t ssid; + + if (argc) { + if (types[argc - 1] == 'f') { + aut = (int)argv[argc - 1]->f; + } else { + aut = argv[argc - 1]->i; + } + } //parse path first to find stripable if (!strncmp (path, "/strip/", 7)) { // find ssid and stripable if (argc > 1) { - strp = get_strip (argv[0]->i, get_address (msg)); - if (argv[1]->f) { - aut = (int)argv[1]->f; + if (types[1] == 'f') { + ssid = (uint32_t)argv[0]->f; } else { - aut = argv[1]->i; + ssid = argv[0]->i; } + strp = get_strip (ssid, get_address (msg)); } else { - uint32_t ssid = atoi (&(strrchr (path, '/' ))[1]); + ssid = atoi (&(strrchr (path, '/' ))[1]); strp = get_strip (ssid, get_address (msg)); - if (argv[0]->f) { - aut = (int)argv[0]->f; - } else { - aut = argv[0]->i; - } } ctr = 7; } else if (!strncmp (path, "/select/", 8)) { @@ -2233,11 +2699,6 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg) } else { strp = ControlProtocol::first_selected_stripable(); } - if (argv[0]->f) { - aut = (int)argv[0]->f; - } else { - aut = argv[0]->i; - } ctr = 8; } else { return ret; @@ -2283,6 +2744,101 @@ OSC::set_automation (const char *path, lo_arg **argv, int argc, lo_message msg) return ret; } +int +OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) +{ + if (!session) return -1; + + int ret = 1; + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr strp = boost::shared_ptr(); + uint32_t ctr = 0; + uint32_t touch = 0; + uint32_t ssid; + + if (argc) { + if (types[argc - 1] == 'f') { + touch = (int)argv[argc - 1]->f; + } else { + touch = argv[argc - 1]->i; + } + } + + //parse path first to find stripable + if (!strncmp (path, "/strip/", 7)) { + // find ssid and stripable + if (argc > 1) { + if (types[0] == 'f') { + ssid = (uint32_t)argv[0]->f; + } else { + ssid = argv[0]->i; + } + strp = get_strip (ssid, get_address (msg)); + } else { + ssid = atoi (&(strrchr (path, '/' ))[1]); + strp = get_strip (ssid, get_address (msg)); + } + ctr = 7; + } else if (!strncmp (path, "/select/", 8)) { + if (sur->expand_enable && sur->expand) { + strp = get_strip (sur->expand, get_address (msg)); + } else { + strp = ControlProtocol::first_selected_stripable(); + } + ctr = 8; + } else { + return ret; + } + if (strp) { + boost::shared_ptr control = boost::shared_ptr(); + // other automatable controls can be added by repeating the next 6.5 lines + if ((!strncmp (&path[ctr], "fader", 5)) || (!strncmp (&path[ctr], "gain", 4))) { + if (strp->gain_control ()) { + control = strp->gain_control (); + } else { + PBD::warning << "No fader for this strip" << endmsg; + } + } else { + PBD::warning << "Automation not available for " << path << endmsg; + } + + if (control) { + if (touch) { + //start touch + if (control->automation_state() == Touch && !control->touching ()) { + control->start_touch (control->session().transport_frame()); + } + ret = 0; + } else { + // end touch + control->stop_touch (true, control->session().transport_frame()); + ret = 0; + } + // just in case some crazy surface starts sending control values before touch + FakeTouchMap::iterator x = _touch_timeout.find(control); + if (x != _touch_timeout.end()) { + _touch_timeout.erase (x); + } + } + } + + return ret; +} + +int +OSC::fake_touch (boost::shared_ptr ctrl) +{ + if (ctrl) { + //start touch + if (ctrl->automation_state() == Touch && !ctrl->touching ()) { + ctrl->start_touch (ctrl->session().transport_frame()); + _touch_timeout[ctrl] = 10; + } + } + + return 0; +} + int OSC::route_mute (int ssid, int yn, lo_message msg) { @@ -2656,22 +3212,32 @@ OSC::_strip_select (boost::shared_ptr s, lo_address addr) delete sur->sel_obs; sur->sel_obs = 0; } - bool feedback_on = sur->feedback.to_ulong(); + bool feedback_on = sur->feedback[13]; if (s && feedback_on) { - OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur->gainmode, sur->feedback); + OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur); s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); sur->sel_obs = sel_fb; } else if (sur->expand_enable) { + // expand doesn't point to a stripable, turn it off and use select sur->expand = 0; sur->expand_enable = false; if (_select && feedback_on) { - OSCSelectObserver* sel_fb = new OSCSelectObserver (_select, addr, sur->gainmode, sur->feedback); - _select->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); + s = _select; + OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur); + s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this); sur->sel_obs = sel_fb; } } else if (feedback_on) { route_send_fail ("select", sur->expand, 0 , addr); } + // need to set monitor for processor changed signal + // detecting processor changes requires cast to route + boost::shared_ptr r = boost::dynamic_pointer_cast(s); + if (r) { + r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, addr), this); + processor_changed (addr); + } + if (!feedback_on) { return 0; } @@ -2722,6 +3288,18 @@ OSC::_strip_select (boost::shared_ptr s, lo_address addr) return 0; } +void +OSC::processor_changed (lo_address addr) +{ + OSCSurface *sur = get_surface (addr); + sur->proc_connection.disconnect (); + _sel_plugin (sur->plugin_id, addr); + if (sur->sel_obs) { + sur->sel_obs->renew_sends (); + sur->sel_obs->eq_restart (-1); + } +} + int OSC::strip_gui_select (int ssid, int yn, lo_message msg) { @@ -2768,6 +3346,7 @@ OSC::route_set_gain_abs (int ssid, float level, lo_message msg) if (s) { if (s->gain_control()) { + fake_touch (s->gain_control()); s->gain_control()->set_value (level, PBD::Controllable::NoGroup); } else { return 1; @@ -2795,11 +3374,41 @@ OSC::route_set_gain_dB (int ssid, float dB, lo_message msg) if (ret != 0) { return route_send_fail ("gain", ssid, -193, get_address (msg)); } - return 0; + return 0; +} + +int +OSC::sel_gain (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + float abs; + if (s->gain_control()) { + if (val < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (val); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } + fake_touch (s->gain_control()); + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("gain", -193, get_address (msg)); } int -OSC::sel_gain (float val, lo_message msg) +OSC::sel_dB_delta (float delta, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr s; @@ -2809,13 +3418,19 @@ OSC::sel_gain (float val, lo_message msg) s = _select; } if (s) { - float abs; - if (val < -192) { - abs = 0; - } else { - abs = dB_to_coefficient (val); - } if (s->gain_control()) { + float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + float abs; + if (dB < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (dB); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } + fake_touch (s->gain_control()); s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); return 0; } @@ -2827,17 +3442,46 @@ int OSC::route_set_gain_fader (int ssid, float pos, lo_message msg) { if (!session) { - route_send_fail ("fader", ssid, 0, get_address (msg)); return -1; } - int ret; - ret = route_set_gain_abs (ssid, slider_position_to_gain_with_max (pos, 2.0), msg); - if (ret != 0) { + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + + if (s) { + if (s->gain_control()) { + fake_touch (s->gain_control()); + s->gain_control()->set_value (s->gain_control()->interface_to_internal (pos), PBD::Controllable::NoGroup); + } else { + return route_send_fail ("fader", ssid, 0, get_address (msg)); + } + } else { return route_send_fail ("fader", ssid, 0, get_address (msg)); } return 0; } +int +OSC::strip_db_delta (int ssid, float delta, lo_message msg) +{ + if (!session) return -1; + boost::shared_ptr s = get_strip (ssid, get_address (msg)); + if (s) { + float db = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta; + float abs; + if (db < -192) { + abs = 0; + } else { + abs = dB_to_coefficient (db); + float top = s->gain_control()->upper(); + if (abs > top) { + abs = top; + } + } + s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + return 0; + } + return -1; +} + int OSC::sel_fader (float val, lo_message msg) { @@ -2849,10 +3493,9 @@ OSC::sel_fader (float val, lo_message msg) s = _select; } if (s) { - float abs; - abs = slider_position_to_gain_with_max (val, 2.0); if (s->gain_control()) { - s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + fake_touch (s->gain_control()); + s->gain_control()->set_value (s->gain_control()->interface_to_internal (val), PBD::Controllable::NoGroup); return 0; } } @@ -3021,11 +3664,7 @@ OSC::route_set_send_fader (int ssid, int id, float val, lo_message msg) } if (s->send_level_controllable (id)) { -#ifdef MIXBUS abs = s->send_level_controllable(id)->interface_to_internal (val); -#else - abs = slider_position_to_gain_with_max (val, 2.0); -#endif s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup); return 0; } @@ -3037,6 +3676,9 @@ int OSC::sel_sendgain (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); + if (sur->send_page_size && (id > (int)sur->send_page_size)) { + return sel_send_fail ("send_gain", id, -193, get_address (msg)); + } boost::shared_ptr s; if (sur->expand_enable) { s = get_strip (sur->expand, get_address (msg)); @@ -3044,9 +3686,10 @@ OSC::sel_sendgain (int id, float val, lo_message msg) s = _select; } float abs; + int send_id = 0; if (s) { if (id > 0) { - --id; + send_id = id - 1; } #ifdef MIXBUS abs = val; @@ -3057,18 +3700,24 @@ OSC::sel_sendgain (int id, float val, lo_message msg) abs = dB_to_coefficient (val); } #endif - if (s->send_level_controllable (id)) { - s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup); + if (sur->send_page_size) { + send_id = send_id + ((sur->send_page - 1) * sur->send_page_size); + } + if (s->send_level_controllable (send_id)) { + s->send_level_controllable (send_id)->set_value (abs, PBD::Controllable::NoGroup); return 0; } } - return sel_send_fail ("send_gain", id + 1, -193, get_address (msg)); + return sel_send_fail ("send_gain", id, -193, get_address (msg)); } int OSC::sel_sendfader (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); + if (sur->send_page_size && (id > (int)sur->send_page_size)) { + return sel_send_fail ("send_fader", id, 0, get_address (msg)); + } boost::shared_ptr s; if (sur->expand_enable) { s = get_strip (sur->expand, get_address (msg)); @@ -3076,19 +3725,19 @@ OSC::sel_sendfader (int id, float val, lo_message msg) s = _select; } float abs; + int send_id = 0; if (s) { if (id > 0) { - --id; + send_id = id - 1; + } + if (sur->send_page_size) { + send_id = send_id + ((sur->send_page - 1) * sur->send_page_size); } - if (s->send_level_controllable (id)) { -#ifdef MIXBUS - abs = s->send_level_controllable(id)->interface_to_internal (val); -#else - abs = slider_position_to_gain_with_max (val, 2.0); -#endif - s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup); + if (s->send_level_controllable (send_id)) { + abs = s->send_level_controllable(send_id)->interface_to_internal (val); + s->send_level_controllable (send_id)->set_value (abs, PBD::Controllable::NoGroup); return 0; } } @@ -3141,27 +3790,34 @@ int OSC::sel_sendenable (int id, float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); + if (sur->send_page_size && (id > (int)sur->send_page_size)) { + return sel_send_fail ("send_enable", id, 0, get_address (msg)); + } boost::shared_ptr s; if (sur->expand_enable) { s = get_strip (sur->expand, get_address (msg)); } else { s = _select; } + int send_id = 0; if (s) { if (id > 0) { - --id; + send_id = id - 1; + } + if (sur->send_page_size) { + send_id = send_id + ((sur->send_page - 1) * sur->send_page_size); } - if (s->send_enable_controllable (id)) { - s->send_enable_controllable (id)->set_value (val, PBD::Controllable::NoGroup); + if (s->send_enable_controllable (send_id)) { + s->send_enable_controllable (send_id)->set_value (val, PBD::Controllable::NoGroup); return 0; } - if (s->send_level_controllable (id)) { + if (s->send_level_controllable (send_id)) { boost::shared_ptr r = boost::dynamic_pointer_cast (s); if (!r) { // should never get here - return sel_send_fail ("send_enable", id + 1, 0, get_address (msg)); + return sel_send_fail ("send_enable", id, 0, get_address (msg)); } - boost::shared_ptr snd = boost::dynamic_pointer_cast (r->nth_send(id)); + boost::shared_ptr snd = boost::dynamic_pointer_cast (r->nth_send(send_id)); if (snd) { if (val) { snd->activate(); @@ -3172,7 +3828,135 @@ OSC::sel_sendenable (int id, float val, lo_message msg) return 0; } } - return sel_send_fail ("send_enable", id + 1, 0, get_address (msg)); + return sel_send_fail ("send_enable", id, 0, get_address (msg)); +} + +int +OSC::sel_master_send_enable (int state, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->master_send_enable_controllable ()) { + s->master_send_enable_controllable()->set_value (state, PBD::Controllable::NoGroup); + return 0; + } + } + return cue_float_message ("/select/master_send_enable", 0, get_address(msg)); +} + +int +OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg) { + OSCSurface *sur = get_surface(get_address (msg)); + int paid; + int piid = sur->plugin_id; + float value = 0; + if (argc > 1) { + // no inline args + if (argc == 2) { + // change parameter in already selected plugin + if (types[0] == 'f') { + paid = (int) argv[0]->f; + } else { + paid = argv[0]->i; + } + value = argv[1]->f; + } else if (argc == 3) { + if (types[0] == 'f') { + piid = (int) argv[0]->f; + } else { + piid = argv[0]->i; + } + _sel_plugin (piid, get_address (msg)); + if (types[1] == 'f') { + paid = (int) argv[1]->f; + } else { + paid = argv[1]->i; + } + value = argv[2]->f; + } else if (argc > 3) { + PBD::warning << "OSC: Too many parameters: " << argc << endmsg; + return -1; + } + } else if (argc) { + const char * par = strstr (&path[25], "/"); + if (par) { + piid = atoi (&path[25]); + _sel_plugin (piid, msg); + paid = atoi (&par[1]); + value = argv[0]->f; + // we have plugin id too + } else { + // just parameter + paid = atoi (&path[25]); + value = argv[0]->f; + } + } else { + PBD::warning << "OSC: Must have parameters." << endmsg; + return -1; + } + if (piid != sur->plugin_id) { + // if the user is sending to a non-existant plugin, don't adjust one we do have + PBD::warning << "OSC: plugin: " << piid << " out of range" << endmsg; + return -1; + } + if (sur->plug_page_size && (paid > (int)sur->plug_page_size)) { + return sel_send_fail ("plugin/parameter", paid, 0, get_address (msg)); + } + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + boost::shared_ptr r = boost::dynamic_pointer_cast(s); + if (!r) { + return 1; + } + + boost::shared_ptr proc = r->nth_plugin (sur->plugins[sur->plugin_id - 1]); + boost::shared_ptr pi; + if (!(pi = boost::dynamic_pointer_cast(proc))) { + return 1; + } + boost::shared_ptr pip = pi->plugin(); + // paid is paged parameter convert to absolute + int parid = paid + (int)(sur->plug_page_size * (sur->plug_page - 1)); + if (parid > (int) sur->plug_params.size ()) { + if (sur->feedback[13]) { + sel_send_fail ("plugin/parameter", paid, 0, get_address (msg)); + } + return 0; + } + + bool ok = false; + uint32_t controlid = pip->nth_parameter(sur->plug_params[parid - 1], ok); + if (!ok) { + return 1; + } + ParameterDescriptor pd; + pip->get_parameter_descriptor(controlid, pd); + if ( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) { + boost::shared_ptr c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); + if (c) { + if (pd.integer_step && pd.upper == 1) { + if (c->get_value () && value < 1.0) { + c->set_value (0, PBD::Controllable::NoGroup); + } else if (!c->get_value () && value) { + c->set_value (1, PBD::Controllable::NoGroup); + } + } else { + c->set_value (c->interface_to_internal (value), PBD::Controllable::NoGroup); + } + return 0; + } + } + return 1; } int @@ -3251,53 +4035,82 @@ OSC::route_plugin_descriptor (int ssid, int piid, lo_message msg) { lo_message reply = lo_message_new(); lo_message_add_int32 (reply, ssid); lo_message_add_int32 (reply, piid); - lo_message_add_string (reply, pip->name()); + lo_message_add_int32(reply, redi->enabled() ? 1 : 0); + for ( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) { uint32_t controlid = pip->nth_parameter(ppi, ok); if (!ok) { continue; } - if ( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) { - boost::shared_ptr c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); - - lo_message_add_int32 (reply, ppi + 1); - ParameterDescriptor pd; - pi->plugin()->get_parameter_descriptor(controlid, pd); - lo_message_add_string (reply, pd.label.c_str()); - - // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements - int flags = 0; - flags |= pd.enumeration ? 1 : 0; - flags |= pd.integer_step ? 2 : 0; - flags |= pd.logarithmic ? 4 : 0; - flags |= pd.max_unbound ? 8 : 0; - flags |= pd.min_unbound ? 16 : 0; - flags |= pd.sr_dependent ? 32 : 0; - flags |= pd.toggled ? 64 : 0; - flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control - lo_message_add_int32 (reply, flags); - - lo_message_add_int32 (reply, pd.datatype); - lo_message_add_float (reply, pd.lower); - lo_message_add_float (reply, pd.upper); - lo_message_add_string (reply, pd.print_fmt.c_str()); - if ( pd.scale_points ) { - lo_message_add_int32 (reply, pd.scale_points->size()); - for ( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) { - lo_message_add_int32 (reply, i->second); - lo_message_add_string (reply, ((std::string)i->first).c_str()); - } - } - else { - lo_message_add_int32 (reply, 0); - } - if ( c ) { - lo_message_add_double (reply, c->get_value()); - } - else { - lo_message_add_double (reply, 0); + boost::shared_ptr c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid)); + + lo_message_add_int32 (reply, ppi + 1); + ParameterDescriptor pd; + pi->plugin()->get_parameter_descriptor(controlid, pd); + lo_message_add_string (reply, pd.label.c_str()); + + // I've combined those binary descriptor parts in a bit-field to reduce lilo message elements + int flags = 0; + flags |= pd.enumeration ? 1 : 0; + flags |= pd.integer_step ? 2 : 0; + flags |= pd.logarithmic ? 4 : 0; + flags |= pd.sr_dependent ? 32 : 0; + flags |= pd.toggled ? 64 : 0; + lo_message_add_int32 (reply, flags); + + switch(pd.datatype) { + case ARDOUR::Variant::BEATS: + lo_message_add_string(reply, _("BEATS")); + break; + case ARDOUR::Variant::BOOL: + lo_message_add_string(reply, _("BOOL")); + break; + case ARDOUR::Variant::DOUBLE: + lo_message_add_string(reply, _("DOUBLE")); + break; + case ARDOUR::Variant::FLOAT: + lo_message_add_string(reply, _("FLOAT")); + break; + case ARDOUR::Variant::INT: + lo_message_add_string(reply, _("INT")); + break; + case ARDOUR::Variant::LONG: + lo_message_add_string(reply, _("LONG")); + break; + case ARDOUR::Variant::NOTHING: + lo_message_add_string(reply, _("NOTHING")); + break; + case ARDOUR::Variant::PATH: + lo_message_add_string(reply, _("PATH")); + break; + case ARDOUR::Variant::STRING: + lo_message_add_string(reply, _("STRING")); + break; + case ARDOUR::Variant::URI: + lo_message_add_string(reply, _("URI")); + break; + default: + lo_message_add_string(reply, _("UNKNOWN")); + break; + } + + lo_message_add_float (reply, pd.lower); + lo_message_add_float (reply, pd.upper); + lo_message_add_string (reply, pd.print_fmt.c_str()); + if ( pd.scale_points ) { + lo_message_add_int32 (reply, pd.scale_points->size()); + for ( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) { + lo_message_add_int32 (reply, i->second); + lo_message_add_string (reply, ((std::string)i->first).c_str()); } + } else { + lo_message_add_int32 (reply, 0); + } + if ( c ) { + lo_message_add_double (reply, c->get_value()); + } else { + lo_message_add_double (reply, 0); } } @@ -3697,7 +4510,7 @@ OSC::sel_eq_enable (float val, lo_message msg) } int -OSC::sel_eq_hpf (float val, lo_message msg) +OSC::sel_eq_hpf_freq (float val, lo_message msg) { OSCSurface *sur = get_surface(get_address (msg)); boost::shared_ptr s; @@ -3712,9 +4525,103 @@ OSC::sel_eq_hpf (float val, lo_message msg) return 0; } } - return sel_fail ("eq_hpf", 0, get_address (msg)); + return sel_fail ("eq_hpf/freq", 0, get_address (msg)); +} + +int +OSC::sel_eq_lpf_freq (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->filter_freq_controllable(false)) { + s->filter_freq_controllable(false)->set_value (s->filter_freq_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("eq_lpf/freq", 0, get_address (msg)); +} + +int +OSC::sel_eq_hpf_enable (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->filter_enable_controllable(true)) { + s->filter_enable_controllable(true)->set_value (s->filter_enable_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("eq_hpf/enable", 0, get_address (msg)); +} + +int +OSC::sel_eq_lpf_enable (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->filter_enable_controllable(false)) { + s->filter_enable_controllable(false)->set_value (s->filter_enable_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("eq_lpf/enable", 0, get_address (msg)); +} + +int +OSC::sel_eq_hpf_slope (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->filter_slope_controllable(true)) { + s->filter_slope_controllable(true)->set_value (s->filter_slope_controllable(true)->interface_to_internal (val), PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("eq_hpf/slope", 0, get_address (msg)); +} + +int +OSC::sel_eq_lpf_slope (float val, lo_message msg) +{ + OSCSurface *sur = get_surface(get_address (msg)); + boost::shared_ptr s; + if (sur->expand_enable) { + s = get_strip (sur->expand, get_address (msg)); + } else { + s = _select; + } + if (s) { + if (s->filter_slope_controllable(false)) { + s->filter_slope_controllable(false)->set_value (s->filter_slope_controllable(false)->interface_to_internal (val), PBD::Controllable::NoGroup); + return 0; + } + } + return sel_fail ("eq_lpf/slope", 0, get_address (msg)); } -// need to add two more filter controls int OSC::sel_eq_gain (int id, float val, lo_message msg) @@ -3828,6 +4735,7 @@ OSC::periodic (void) if (!tick) { Glib::usleep(100); // let flurry of signals subside if (global_init) { + Glib::Threads::Mutex::Lock lm (surfaces_lock); for (uint32_t it = 0; it < _surface.size(); it++) { OSCSurface* sur = &_surface[it]; lo_address addr = lo_address_new_from_url (sur->remote_url.c_str()); @@ -3886,6 +4794,17 @@ OSC::periodic (void) co->tick(); } } + for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end();) { + _touch_timeout[(*x).first] = (*x).second - 1; + if (!(*x).second) { + boost::shared_ptr ctrl = (*x).first; + // turn touch off + ctrl->stop_touch (true, ctrl->session().transport_frame()); + _touch_timeout.erase (x++); + } else { + x++; + } + } return true; } @@ -3972,20 +4891,8 @@ OSC::get_state () node.set_property ("striptypes", default_strip); node.set_property ("feedback", default_feedback); node.set_property ("gainmode", default_gainmode); - if (_surface.size()) { - XMLNode* config = new XMLNode (X_("Configurations")); - for (uint32_t it = 0; it < _surface.size(); ++it) { - OSCSurface* sur = &_surface[it]; - XMLNode* devnode = new XMLNode (X_("Configuration")); - devnode->set_property (X_("url"), sur->remote_url); - devnode->set_property (X_("bank-size"), sur->bank_size); - devnode->set_property (X_("strip-types"), (uint64_t)sur->strip_types.to_ulong()); - devnode->set_property (X_("feedback"), (uint64_t)sur->feedback.to_ulong()); - devnode->set_property (X_("gainmode"), sur->gainmode); - config->add_child_nocopy (*devnode); - } - node.add_child_nocopy (*config); - } + node.set_property ("send-page-size", default_send_size); + node.set_property ("plug-page-size", default_plugin_size); return node; } @@ -4006,43 +4913,9 @@ OSC::set_state (const XMLNode& node, int version) node.get_property (X_("striptypes"), default_strip); node.get_property (X_("feedback"), default_feedback); node.get_property (X_("gainmode"), default_gainmode); + node.get_property (X_("send-page-size"), default_send_size); + node.get_property (X_("plugin-page-size"), default_plugin_size); - XMLNode* cnode = node.child (X_("Configurations")); - - if (cnode) { - XMLNodeList const& devices = cnode->children(); - for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) { - OSCSurface s; - if (!(*d)->get_property (X_("url"), s.remote_url)) { - continue; - } - - bank_dirty = true; - - (*d)->get_property (X_("bank-size"), s.bank_size); - - uint64_t bits; - if ((*d)->get_property (X_ ("strip-types"), bits)) { - s.strip_types = bits; - } - if ((*d)->get_property (X_("feedback"), bits)) { - s.feedback = bits; - } - (*d)->get_property (X_("gainmode"), s.gainmode); - - s.bank = 1; - s.sel_obs = 0; - s.expand = 0; - s.expand_enable = false; - s.strips = get_sorted_stripables (s.strip_types, s.cue); - s.nstrips = s.strips.size (); - s.no_clear = false; - s.jogmode = JOG; - s.cue = false; - s.aux = 0; - _surface.push_back (s); - } - } global_init = true; tick = false; @@ -4115,6 +4988,15 @@ OSC::get_sorted_stripables(std::bitset<32> types, bool cue) } else if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) { sorted.push_back (s); } +#ifdef MIXBUS + else if (types[2]) { + if (Profile->get_mixbus()) { + if (s->mixbus()) { + sorted.push_back (s); + } + } + } +#endif } } sort (sorted.begin(), sorted.end(), StripableByPresentationOrder()); @@ -4303,10 +5185,8 @@ OSC::cue_aux_fader (float position, lo_message msg) boost::shared_ptr s = get_strip (sur->aux, get_address (msg)); if (s) { - float abs; - abs = slider_position_to_gain_with_max (position, 2.0); if (s->gain_control()) { - s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + s->gain_control()->set_value (s->gain_control()->interface_to_internal (position), PBD::Controllable::NoGroup); return 0; } } @@ -4344,11 +5224,9 @@ OSC::cue_send_fader (uint32_t id, float val, lo_message msg) return -1; } boost::shared_ptr s = cue_get_send (id, get_address (msg)); - float abs; if (s) { if (s->gain_control()) { - abs = slider_position_to_gain_with_max (val, 2.0); - s->gain_control()->set_value (abs, PBD::Controllable::NoGroup); + s->gain_control()->set_value (s->gain_control()->interface_to_internal(val), PBD::Controllable::NoGroup); return 0; } }