#include "ardour/route.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
+#include "ardour/vca.h"
#include "ardour/monitor_control.h"
#include "ardour/dB.h"
#include "ardour/filesystem_paths.h"
, _osc_server (0)
, _osc_unix_server (0)
, _debugmode (Off)
- , address_only (false)
+ , address_only (true)
, remote_port ("8000")
, default_banksize (0)
, default_strip (159)
, default_plugin_size (0)
, tick (true)
, bank_dirty (false)
+ , observer_busy (true)
, scrub_speed (0)
, gui (0)
{
OSC::~OSC()
{
+ tick = false;
stop ();
tear_down_gui ();
_instance = 0;
}
}
+ observer_busy = false;
register_callbacks();
session_loaded (*session);
// order changed
PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
- _select = boost::shared_ptr<Stripable>();
+ _select = ControlProtocol::first_selected_stripable();
+ if(!_select) {
+ _select = session->master_out ();
+ }
return 0;
}
int
OSC::stop ()
{
- /* stop main loop */
+ periodic_connection.disconnect ();
+ session_connections.drop_connections ();
+
+ // clear surfaces
+ observer_busy = true;
+ for (uint32_t it = 0; it < _surface.size (); ++it) {
+ OSCSurface* sur = &_surface[it];
+ surface_destroy (sur);
+ }
+ _surface.clear();
+ /* stop main loop */
if (local_server) {
g_source_destroy (local_server);
g_source_unref (local_server);
::g_unlink (_osc_url_file.c_str() );
}
- periodic_connection.disconnect ();
- session_connections.drop_connections ();
- cueobserver_connections.drop_connections ();
- // Delete any active route observers
- for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
-
- OSCRouteObserver* rc;
+ return 0;
+}
- if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
- delete *x;
- x = route_observers.erase (x);
- } else {
- ++x;
- }
+void
+OSC::surface_destroy (OSCSurface* sur)
+{
+ OSCSelectObserver* so;
+ if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
+ so->clear_observer ();
+ delete so;
+ sur->sel_obs = 0;
+ PBD::ScopedConnection pc = sur->proc_connection;
+ pc.disconnect ();
}
-// Should maybe do global_observers too
- for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) {
-
- OSCGlobalObserver* gc;
- if ((gc = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
- delete *x;
- x = global_observers.erase (x);
- } else {
- ++x;
- }
+ OSCCueObserver* co;
+ if ((co = dynamic_cast<OSCCueObserver*>(sur->cue_obs)) != 0) {
+ delete co;
+ sur->cue_obs = 0;
+ sur->sends.clear ();
}
-// delete select observers
- for (uint32_t it = 0; it < _surface.size(); ++it) {
- OSCSurface* sur = &_surface[it];
- OSCSelectObserver* so;
- if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
- delete so;
- }
+ OSCGlobalObserver* go;
+ if ((go = dynamic_cast<OSCGlobalObserver*>(sur->global_obs)) != 0) {
+ go->clear_observer ();
+ delete go;
+ sur->global_obs = 0;
}
+ uint32_t st_end = sur->observers.size ();
-// delete cue observers
- for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) {
-
- OSCCueObserver* co;
-
- if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
- delete *x;
- x = cue_observers.erase (x);
- } else {
- ++x;
+ for (uint32_t i = 0; i < st_end; i++) {
+ OSCRouteObserver* ro;
+ if ((ro = dynamic_cast<OSCRouteObserver*>(sur->observers[i])) != 0) {
+ ro->clear_strip ();
+ delete ro;
+ ro = 0;
}
}
-
- return 0;
+ sur->observers.clear();
}
+
void
OSC::register_callbacks()
{
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, "/strip/custom/mode", "f", custom_mode);
+ REGISTER_CALLBACK (serv, "/strip/custom/clear", "f", custom_clear);
+ REGISTER_CALLBACK (serv, "/strip/custom/clear", "", custom_clear);
+ REGISTER_CALLBACK (serv, "/surface/list", "", surface_list);
+ REGISTER_CALLBACK (serv, "/surface/list", "f", surface_list);
REGISTER_CALLBACK (serv, "/add_marker", "", add_marker);
REGISTER_CALLBACK (serv, "/add_marker", "f", add_marker);
REGISTER_CALLBACK (serv, "/access_action", "s", access_action);
REGISTER_CALLBACK (serv, "/transport_stop", "f", transport_stop);
REGISTER_CALLBACK (serv, "/transport_play", "", transport_play);
REGISTER_CALLBACK (serv, "/transport_play", "f", transport_play);
- REGISTER_CALLBACK (serv, "/transport_frame", "", transport_frame);
+ REGISTER_CALLBACK (serv, "/transport_frame", "", transport_sample);
REGISTER_CALLBACK (serv, "/transport_speed", "", transport_speed);
REGISTER_CALLBACK (serv, "/record_enabled", "", record_enabled);
REGISTER_CALLBACK (serv, "/set_transport_speed", "f", set_transport_speed);
REGISTER_CALLBACK (serv, "/mark_out", "f", mark_out);
REGISTER_CALLBACK (serv, "/toggle_click", "", toggle_click);
REGISTER_CALLBACK (serv, "/toggle_click", "f", toggle_click);
+ REGISTER_CALLBACK (serv, "/click/level", "f", click_level);
REGISTER_CALLBACK (serv, "/midi_panic", "", midi_panic);
REGISTER_CALLBACK (serv, "/midi_panic", "f", midi_panic);
REGISTER_CALLBACK (serv, "/toggle_roll", "", toggle_roll);
REGISTER_CALLBACK (serv, "/bank_up", "f", bank_delta);
REGISTER_CALLBACK (serv, "/bank_down", "", bank_down);
REGISTER_CALLBACK (serv, "/bank_down", "f", bank_down);
+ REGISTER_CALLBACK (serv, "/use_group", "f", use_group);
// 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, "/master/select", "f", master_select);
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);
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/hide", "i", sel_hide);
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_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/plugin/activate", "f", sel_plugin_activate);
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);
REGISTER_CALLBACK (serv, "/strip/monitor_input", "ii", route_monitor_input);
REGISTER_CALLBACK (serv, "/strip/monitor_disk", "ii", route_monitor_disk);
REGISTER_CALLBACK (serv, "/strip/expand", "ii", strip_expand);
+ REGISTER_CALLBACK (serv, "/strip/hide", "ii", strip_hide);
REGISTER_CALLBACK (serv, "/strip/select", "ii", strip_gui_select);
REGISTER_CALLBACK (serv, "/strip/polarity", "ii", strip_phase);
REGISTER_CALLBACK (serv, "/strip/gain", "if", route_set_gain_dB);
/* this is a special catchall handler,
* register at the end so this is only called if no
- * other handler matches (used for debug) */
+ * other handler matches (also used for debug) */
lo_server_add_method (serv, 0, 0, _catchall, this);
}
}
session->set_dirty();
}
-void
-OSC::listen_to_route (boost::shared_ptr<Stripable> strip, lo_address addr)
-{
- if (!strip) {
- return;
- }
- /* avoid duplicate listens */
-
- for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); ++x) {
-
- OSCRouteObserver* ro;
-
- if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
-
- int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
-
- if (ro->strip() == strip && res == 0) {
- return;
- }
- }
- }
-
- OSCSurface *s = get_surface(addr);
- uint32_t ssid = get_sid (strip, addr);
- OSCRouteObserver* o = new OSCRouteObserver (strip, addr, ssid, s);
- route_observers.push_back (o);
-
- strip->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::route_lost, this, boost::weak_ptr<Stripable> (strip)), this);
-}
-
-void
-OSC::route_lost (boost::weak_ptr<Stripable> wr)
-{
- tick = false;
- drop_route (wr);
- bank_dirty = true;
-}
-
-void
-OSC::drop_route (boost::weak_ptr<Stripable> wr)
-{
- boost::shared_ptr<Stripable> r = wr.lock ();
-
- if (!r) {
- return;
- }
-
- for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
-
- OSCRouteObserver* rc;
-
- if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
-
- if (rc->strip() == r) {
- delete *x;
- x = route_observers.erase (x);
- } else {
- ++x;
- }
- } else {
- ++x;
- }
- }
-}
-
-void
-OSC::end_listen (boost::shared_ptr<Stripable> r, lo_address addr)
-{
- RouteObservers::iterator x;
-
- // Remove the route observers
- for (x = route_observers.begin(); x != route_observers.end();) {
-
- OSCRouteObserver* ro;
-
- if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
-
- int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
-
- if (ro->strip() == r && res == 0) {
- delete *x;
- x = route_observers.erase (x);
- }
- else {
- ++x;
- }
- }
- else {
- ++x;
- }
- }
-}
-
void
OSC::current_value_query (const char* path, size_t len, lo_arg **argv, int argc, lo_message msg)
{
/* 15 for /#current_value plus 2 for /<path> */
len = strlen (path);
- OSCSurface *sur = get_surface(get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg), true);
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+
+ if (ls) {
+ set = &(link_sets[ls]);
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ }
if (strstr (path, "/automation")) {
ret = set_automation (path, types, argv, argc, msg);
ret = 0;
} else
if (strcmp (path, "/strip/listen") == 0) {
- check_surface (msg);
-
- cerr << "set up listener\n";
-
- lo_message reply = lo_message_new ();
-
if (argc <= 0) {
- lo_message_add_string (reply, "syntax error");
+ PBD::warning << "OSC: Wrong number of parameters." << endmsg;
+ } else if (sur->custom_mode) {
+ PBD::warning << "OSC: Can't add strips with custom enabled." << endmsg;
} else {
for (int n = 0; n < argc; ++n) {
-
- boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
-
- if (!r) {
- lo_message_add_string (reply, "not found");
- cerr << "no such route\n";
- break;
- } else {
- cerr << "add listener\n";
- listen_to_route (r, get_address (msg));
- lo_message_add_int32 (reply, argv[n]->i);
+ boost::shared_ptr<Stripable> s = boost::shared_ptr<Stripable>();
+ if (types[n] == 'f') {
+ s = get_strip ((uint32_t) argv[n]->f, get_address (msg));
+ } else if (types[n] == 'i') {
+ s = get_strip (argv[n]->i, get_address (msg));
+ }
+ if (s) {
+ sur->custom_strips.push_back (s);
}
}
+ if (ls) {
+ set->custom_strips = sur->custom_strips;
+ }
}
-
- 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;
-
} else
if (strcmp (path, "/strip/ignore") == 0) {
- check_surface (msg);
-
- for (int n = 0; n < argc; ++n) {
-
- boost::shared_ptr<Route> r = session->get_remote_nth_route (argv[n]->i);
-
- if (r) {
- end_listen (r, get_address (msg));
+ if (argc <= 0) {
+ PBD::warning << "OSC: Wrong number of parameters." << endmsg;
+ } else if (!sur->custom_mode) {
+ PBD::warning << "OSC: Can't remove strips without custom enabled." << endmsg;
+ } else {
+ for (int n = 0; n < argc; ++n) {
+ uint32_t st_no = 0;
+ if (types[n] == 'f') {
+ st_no = (uint32_t) argv[n]->f;
+ } else if (types[n] == 'i') {
+ st_no = (uint32_t) argv[n]->i;
+ }
+ if (st_no && st_no <= sur->custom_strips.size ()) {
+ sur->custom_strips[argv[n]->i - 1] = boost::shared_ptr<Stripable>();
+ }
}
+ if (ls) {
+ set->custom_strips = sur->custom_strips;
+ }
+ ret = set_bank (sur->bank, msg);
}
ret = 0;
} else
+ if (strstr (path, "/strip") && (argc != 1)) {
+ // All of the strip commands below require 1 parameter
+ PBD::warning << "OSC: Wrong number of parameters." << endmsg;
+ } else
if (!strncmp (path, "/strip/gain/", 12) && strlen (path) > 12) {
// in dB
int ssid = atoi (&path[12]);
int ssid = atoi (&path[14]);
ret = strip_expand (ssid, argv[0]->i, msg);
}
+ else if (!strncmp (path, "/strip/hide/", 12) && strlen (path) > 12) {
+ int ssid = atoi (&path[12]);
+ ret = strip_hide (ssid, argv[0]->i, msg);
+ }
else if (!strncmp (path, "/strip/select/", 14) && strlen (path) > 14) {
int ssid = atoi (&path[14]);
ret = strip_gui_select (ssid, argv[0]->i, msg);
+ } else
+ if (strstr (path, "/select") && (argc != 1)) {
+ // All of the select commands below require 1 parameter
+ PBD::warning << "OSC: Wrong number of parameters." << endmsg;
}
else if (!strncmp (path, "/select/send_gain/", 18) && strlen (path) > 18) {
int ssid = atoi (&path[18]);
int ssid = atoi (&path[17]);
ret = sel_eq_shape (ssid, argv[0]->f, msg);
}
+ else if (!strncmp (path, "/marker", 7)) {
+ ret = set_marker (types, argv, argc, msg);
+ }
else if (!strncmp (path, "/set_surface", 12)) {
ret = surface_parse (path, types, argv, argc, msg);
}
+ else if (strstr (path, "/link")) {
+ ret = parse_link (path, types, argv, argc, msg);
+ }
if (ret) {
check_surface (msg);
}
if (strcmp (argv[0]->s, "transport_frame") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else if (strcmp (argv[0]->s, "transport_speed") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else if (strcmp (argv[0]->s, "transport_locked") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else if (strcmp (argv[0]->s, "punch_in") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else if (strcmp (argv[0]->s, "punch_out") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else if (strcmp (argv[0]->s, "rec_enable") == 0) {
if (session) {
- lo_send (addr, retpath, "i", session->transport_frame());
+ lo_send (addr, retpath, "i", session->transport_sample());
}
} else {
if (!session) {
return;
}
- OSCSurface *sur = get_surface(get_address (msg));
- sur->no_clear = true;
+ OSCSurface *sur = get_surface(get_address (msg), true);
for (int n = 0; n < (int) sur->nstrips; ++n) {
lo_message reply = lo_message_new ();
- if (s->presentation_info().flags() & PresentationInfo::AudioTrack) {
+ if (boost::dynamic_pointer_cast<AudioTrack>(s)) {
lo_message_add_string (reply, "AT");
- } else if (s->presentation_info().flags() & PresentationInfo::MidiTrack) {
+ } else if (boost::dynamic_pointer_cast<MidiTrack>(s)) {
lo_message_add_string (reply, "MT");
- } else if (s->presentation_info().flags() & PresentationInfo::AudioBus) {
- // r->feeds (session->master_out()) may make more sense
- if (r->direct_feeds_according_to_reality (session->master_out())) {
- // this is a bus
- lo_message_add_string (reply, "B");
+ } else if (boost::dynamic_pointer_cast<VCA>(s)) {
+ 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");
+ } else if (boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+ // r->feeds (session->master_out()) may make more sense
+ if (r->direct_feeds_according_to_reality (session->master_out())) {
+ // this is a bus
+ lo_message_add_string (reply, "B");
+ } else {
+ // this is an Aux out
+ lo_message_add_string (reply, "AX");
+ }
} else {
- // this is an Aux out
- lo_message_add_string (reply, "AX");
+ lo_message_add_string (reply, "MB");
}
- } else if (s->presentation_info().flags() & PresentationInfo::MidiBus) {
- lo_message_add_string (reply, "MB");
- } else if (s->presentation_info().flags() & PresentationInfo::VCA) {
- lo_message_add_string (reply, "V");
}
lo_message_add_string (reply, s->name().c_str());
if (s->rec_enable_control()) {
lo_message_add_int32 (reply, s->rec_enable_control()->get_value());
}
-
- //Automatically listen to stripables listed
- listen_to_route(s, get_address (msg));
-
if (sur->feedback[14]) {
lo_send_message (get_address (msg), "/reply", reply);
} else {
lo_message reply = lo_message_new ();
lo_message_add_string (reply, "end_route_list");
- lo_message_add_int64 (reply, session->frame_rate());
- lo_message_add_int64 (reply, session->current_end_frame());
+ lo_message_add_int64 (reply, session->sample_rate());
+ lo_message_add_int64 (reply, session->current_end_sample());
if (session->monitor_out()) {
// this session has a monitor section
lo_message_add_int32 (reply, 1);
}
lo_message_free (reply);
+ // send feedback for newly created control surface
+ strip_feedback (sur, true);
+ global_feedback (sur);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), get_address (msg));
+
+}
+
+void
+OSC::surface_list (lo_message msg)
+{
+ get_surfaces ();
+}
+
+void
+OSC::get_surfaces ()
+{
+
+ /* this function is for debugging and prints lots of
+ * information about what surfaces Ardour knows about and their
+ * internal parameters. It is best accessed by sending:
+ * /surface/list from oscsend. This command does not create
+ * a surface entry.
+ */
+
+ PBD::info << string_compose ("\nList of known Surfaces (%1):\n", _surface.size());
+
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ for (uint32_t it = 0; it < _surface.size(); it++) {
+ OSCSurface* sur = &_surface[it];
+ PBD::info << string_compose ("\n Surface: %1 - URL: %2\n", it, sur->remote_url);
+ PBD::info << string_compose (" Number of strips: %1 Bank size: %2 Current Bank %3\n", sur->nstrips, sur->bank_size, sur->bank);
+ PBD::info << string_compose (" Use Custom: %1 Custom Strips: %2\n", sur->custom_mode, sur->custom_strips.size ());
+ bool ug = false;
+ if (sur->usegroup == PBD::Controllable::UseGroup) {
+ ug = true;
+ }
+ PBD::info << string_compose (" Strip Types: %1 Feedback: %2 No_clear flag: %3 Gain mode: %4 Use groups flag %5\n", \
+ sur->strip_types.to_ulong(), sur->feedback.to_ulong(), sur->no_clear, sur->gainmode, ug);
+ PBD::info << string_compose (" Using plugin: %1 of %2 plugins, with %3 params. Page size: %4 Page: %5\n", \
+ sur->plugin_id, sur->plugins.size(), sur->plug_params.size(), sur->plug_page_size, sur->plug_page);
+ PBD::info << string_compose (" Send page size: %1 Page: %2\n", sur->send_page_size, sur->send_page);
+ PBD::info << string_compose (" Expanded flag %1 Track: %2 Jogmode: %3\n", sur->expand_enable, sur->expand, sur->jogmode);
+ PBD::info << string_compose (" Personal monitor flag %1, Aux master: %2, Number of sends: %3\n", sur->cue, sur->aux, sur->sends.size());
+ PBD::info << string_compose (" Linkset: %1 Device Id: %2\n", sur->linkset, sur->linkid);
+ }
+ PBD::info << string_compose ("\nList of LinkSets (%1):\n", link_sets.size());
+ std::map<uint32_t, LinkSet>::iterator it;
+ for (it = link_sets.begin(); it != link_sets.end(); it++) {
+ if (!(*it).first) {
+ continue;
+ }
+ uint32_t devices = 0;
+ LinkSet* set = &(*it).second;
+ if (set->urls.size()) {
+ devices = set->urls.size() - 1;
+ }
+ PBD::info << string_compose ("\n Linkset %1 has %2 devices and sees %3 strips\n", (*it).first, devices, set->strips.size());
+ PBD::info << string_compose (" Bank size: %1 Current bank: %2 Strip Types: %3\n", set->banksize, set->bank, set->strip_types.to_ulong());
+ PBD::info << string_compose (" Auto bank sizing: %1 Linkset not ready flag: %2\n", set->autobank, set->not_ready);
+ PBD::info << string_compose (" Use Custom: %1 Number of Custom Strips: %2\n", set->custom_mode, set->custom_strips.size ());
+ }
+ PBD::info << endmsg;
+}
+
+int
+OSC::custom_clear (lo_message msg)
+{
+ if (!session) {
+ return 0;
+ }
+ OSCSurface *sur = get_surface(get_address (msg), true);
+ sur->custom_mode = 0;
+ sur->custom_strips.clear ();
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, false, sur->custom_strips);
+ sur->nstrips = sur->strips.size();
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+ if (ls) {
+ set = &(link_sets[ls]);
+ set->custom_mode = 0;
+ set->custom_strips.clear ();
+ set->strips = sur->strips;
+ }
+ return set_bank (1, msg);
+}
+
+int
+OSC::custom_mode (float state, lo_message msg)
+{
+ if (!session) {
+ return 0;
+ }
+ OSCSurface *sur = get_surface(get_address (msg), true);
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
+
+ if (ls) {
+ set = &(link_sets[ls]);
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ }
+ if (state > 0){
+ if (sur->custom_strips.size () == 0) {
+ PBD::warning << "No custom strips set to enable" << endmsg;
+ sur->custom_mode = 0;
+ if (ls) {
+ set->custom_mode = 0;
+ }
+ return -1;
+ } else {
+ if (sur->bank_size) {
+ sur->custom_mode = (uint32_t) state | 0x4;
+ } else {
+ sur->custom_mode = (uint32_t) state;
+ }
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips);
+ sur->nstrips = sur->custom_strips.size();
+ }
+ } else {
+ sur->custom_mode = 0;
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, 0, sur->custom_strips);
+ sur->nstrips = sur->strips.size();
+ }
+ if (ls) {
+ set->custom_mode = sur->custom_mode;
+ set->strips = sur->strips;
+ }
+ return set_bank (1, msg);
}
int
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));
+ OSCSurface *s = get_surface(get_address (msg), true);
+ uint32_t bs = s->bank_size;
+ uint32_t st = (uint32_t) s->strip_types.to_ulong();
+ uint32_t fb = (uint32_t) s->feedback.to_ulong();
+ uint32_t gm = (uint32_t) s->gainmode;
+ uint32_t sp = s->send_page_size;
+ uint32_t pp = s->plug_page_size;
+
+ surface_destroy (s);
// 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, (uint32_t) s->send_page_size, (uint32_t) s->plug_page_size, msg);
+ set_surface (bs, st, fb, gm, sp, pp, msg);
return 0;
}
void
OSC::clear_devices ()
{
- for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
+ tick = false;
+ observer_busy = true;
+ session_connections.drop_connections ();
+ // clear out surfaces
+ for (uint32_t it = 0; it < _surface.size(); ++it) {
+ OSCSurface* sur = &_surface[it];
+ surface_destroy (sur);
+ }
+ _surface.clear();
+ link_sets.clear ();
+
+ PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
- OSCRouteObserver* rc;
+ observer_busy = false;
+ tick = true;
+}
- if ((rc = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
- delete *x;
- x = route_observers.erase (x);
+int
+OSC::parse_link (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
+{
+ int ret = 1; /* unhandled */
+ int set = 0;
+ if (!argc) {
+ PBD::warning << "OSC: /link/* needs at least one parameter" << endmsg;
+ return ret;
+ }
+ float data = 0;
+ if (types[argc - 1] == 'f') {
+ data = argv[argc - 1]->f;
+ } else {
+ data = argv[argc - 1]->i;
+ }
+ if (isdigit(strrchr (path, '/')[1])) {
+ set = atoi (&(strrchr (path, '/')[1]));
+ } else if (argc == 2) {
+ if (types[0] == 'f') {
+ set = (int) argv[0]->f;
} else {
- ++x;
+ set = argv[0]->i;
}
- // slow devices need time to clear buffers
- usleep ((uint32_t) 10);
+ } else {
+ PBD::warning << "OSC: wrong number of parameters." << endmsg;
+ return ret;
}
- // Should maybe do global_observers too
- for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end();) {
-
- OSCGlobalObserver* gc;
+ LinkSet *ls = get_linkset (set, get_address (msg));
- if ((gc = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
- delete *x;
- x = global_observers.erase (x);
+ if (!set) {
+ return 0;
+ }
+ if (!strncmp (path, "/link/bank_size", 15)) {
+ ls->banksize = (uint32_t) data;
+ ls->autobank = false;
+ ls->not_ready = link_check (set);
+ if (ls->not_ready) {
+ ls->bank = 1;
+ surface_link_state (ls);
} else {
- ++x;
+ _set_bank (ls->bank, get_address (msg));
}
+ ret = 0;
+
+ } else if (!strncmp (path, "/link/set", 9)) {
+ ret = set_link (set, (uint32_t) data, get_address (msg));
}
- // delete select observers
- for (uint32_t it = 0; it < _surface.size(); ++it) {
- OSCSurface* sur = &_surface[it];
- OSCSelectObserver* so;
- if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
- delete so;
+
+ return ret;
+}
+
+OSC::LinkSet *
+OSC::get_linkset (uint32_t set, lo_address addr)
+{
+ OSCSurface *sur = get_surface(addr);
+ LinkSet *ls = 0;
+
+ if (set) {
+ // need to check if set is wanted
+ std::map<uint32_t, LinkSet>::iterator it;
+ it = link_sets.find(set);
+ if (it == link_sets.end()) {
+ // no such linkset make it
+ LinkSet new_ls;
+ new_ls.banksize = 0;
+ new_ls.bank = 1;
+ new_ls.autobank = true;
+ new_ls.not_ready = true;
+ new_ls.strip_types = sur->strip_types;
+ new_ls.strips = sur->strips;
+ new_ls.custom_strips = sur->custom_strips;
+ new_ls.custom_mode = sur->custom_mode;
+ new_ls.urls.resize (2);
+ link_sets[set] = new_ls;
+ }
+ ls = &link_sets[set];
+
+ } else {
+ // User expects this surface to be removed from any sets
+ uint32_t oldset = sur->linkset;
+ if (oldset) {
+ uint32_t oldid = sur->linkid;
+ sur->linkid = 1;
+ sur->linkset = 0;
+ LinkSet *ols = &link_sets[oldset];
+ if (ols) {
+ ols->not_ready = oldid;
+ ols->urls[oldid] = "";
+ surface_link_state (ols);
+ }
}
}
- // delete cue observers
- for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end();) {
- OSCCueObserver* co;
- if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
- delete *x;
- x = cue_observers.erase (x);
- } else {
- ++x;
+ return ls;
+}
+
+int
+OSC::set_link (uint32_t set, uint32_t id, lo_address addr)
+{
+ OSCSurface *sur = get_surface(addr, true);
+ sur->linkset = set;
+ sur->linkid = id;
+ LinkSet *ls = get_linkset (set, addr);
+ if (ls->urls.size() <= (uint32_t) id) {
+ ls->urls.resize ((int) id + 1);
+ }
+ ls->urls[(uint32_t) id] = sur->remote_url;
+ ls->not_ready = link_check (set);
+ if (ls->not_ready) {
+ surface_link_state (ls);
+ } else {
+ _set_bank (1, addr);
+ }
+ return 0;
+}
+
+void
+OSC::link_strip_types (uint32_t linkset, uint32_t striptypes)
+{
+ LinkSet *ls = 0;
+
+ if (!linkset) {
+ return;
+ }
+ std::map<uint32_t, LinkSet>::iterator it;
+ it = link_sets.find(linkset);
+ if (it == link_sets.end()) {
+ // this should never happen... but
+ return;
+ }
+ ls = &link_sets[linkset];
+ ls->strip_types = striptypes;
+ for (uint32_t dv = 1; dv < ls->urls.size(); dv++) {
+ OSCSurface *su;
+
+ if (ls->urls[dv] != "") {
+ string url = ls->urls[dv];
+ su = get_surface (lo_address_new_from_url (url.c_str()), true);
+ if (su->linkset == linkset) {
+ su->strip_types = striptypes;
+ if (su->strip_types[10]) {
+ su->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ su->usegroup = PBD::Controllable::NoGroup;
+ }
+ } else {
+ ls->urls[dv] = "";
+ }
}
}
+}
- // clear out surfaces
- _surface.clear();
+void
+OSC::surface_link_state (LinkSet * set)
+{
+ for (uint32_t dv = 1; dv < set->urls.size(); dv++) {
+
+ if (set->urls[dv] != "") {
+ string url = set->urls[dv];
+ OSCSurface *sur = get_surface (lo_address_new_from_url (url.c_str()), true);
+ for (uint32_t i = 0; i < sur->observers.size(); i++) {
+ sur->observers[i]->set_link_ready (set->not_ready);
+ }
+ }
+ }
+}
+
+int
+OSC::link_check (uint32_t set)
+{
+ LinkSet *ls = 0;
+
+ if (!set) {
+ return 1;
+ }
+ std::map<uint32_t, LinkSet>::iterator it;
+ it = link_sets.find(set);
+ if (it == link_sets.end()) {
+ // this should never happen... but
+ return 1;
+ }
+ ls = &link_sets[set];
+ uint32_t bank_total = 0;
+ for (uint32_t dv = 1; dv < ls->urls.size(); dv++) {
+ OSCSurface *su;
+
+ if (ls->urls[dv] != "") {
+ string url = ls->urls[dv];
+ su = get_surface (lo_address_new_from_url (url.c_str()), true);
+ } else {
+ return dv;
+ }
+ if (su->linkset == set) {
+ bank_total = bank_total + su->bank_size;
+ } else {
+ ls->urls[dv] = "";
+ return dv;
+ }
+ if (ls->autobank) {
+ ls->banksize = bank_total;
+ } else {
+ if (bank_total != ls->banksize) {
+ return ls->urls.size();
+ }
+ }
+ }
+ return 0;
}
int
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));
+ OSCSurface *sur = get_surface(get_address (msg), true);
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;
+ int linkset = sur->linkset;
+ int linkid = sur->linkid;
- if (!strncmp (path, "/set_surface/feedback", 21)) {
- if (argv[0]->f) {
+ if (argc == 1 && !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 (argv[0]->f) {
+ else if (argc == 1 && !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 (argv[0]->f) {
+ else if (argc == 1 && !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 (argv[0]->f) {
+ else if (argc == 1 && !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 (argv[0]->f) {
+ else if (argc == 1 && !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 (argv[0]->f) {
+ else if (argc == 1 && !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 8:
+ if (types[7] == 'f') {
+ linkid = (int) argv[7]->f;
+ } else {
+ linkid = argv[7]->i;
+ }
+ case 7:
+ if (types[6] == 'f') {
+ linkset = (int) argv[6]->f;
+ } else {
+ linkset = argv[6]->i;
+ }
case 6:
- if (argv[5]->f) {
+ if (types[5] == 'f') {
pi_page = (int) argv[5]->f;
} else {
pi_page = argv[5]->i;
}
case 5:
- if (argv[4]->f) {
+ if (types[4] == 'f') {
se_page = (int) argv[4]->f;
} else {
se_page = argv[4]->i;
}
case 4:
- if (argv[3]->f) {
+ if (types[3] == 'f') {
fadermode = (int) argv[3]->f;
} else {
fadermode = argv[3]->i;
}
case 3:
- if (argv[2]->f) {
+ if (types[2] == 'f') {
feedback = (int) argv[2]->f;
} else {
feedback = argv[2]->i;
}
case 2:
- if (argv[1]->f) {
+ if (types[1] == 'f') {
strip_types = (int) argv[1]->f;
} else {
strip_types = argv[1]->i;
}
case 1:
- if (argv[0]->f) {
+ 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);
+ if ((uint32_t) linkset != sur->linkset) {
+ set_link (linkset, linkid, get_address (msg));
+ }
break;
case 0:
// send current setup
lo_message_add_int32 (reply, fadermode);
lo_message_add_int32 (reply, se_page);
lo_message_add_int32 (reply, pi_page);
+ lo_message_add_int32 (reply, (int) linkset);
+ lo_message_add_int32 (reply, (int) linkid);
lo_send_message (get_address (msg), "/set_surface", reply);
lo_message_free (reply);
return 0;
const char * pp = strstr (&sp[1], "/");
if (pp) {
pi_page = atoi (&pp[1]);
+ const char * ls = strstr (&pp[1], "/");
+ if (ls) {
+ linkset = atoi (&ls[1]);
+ const char * li = strstr (&ls[1], "/");
+ if (li) {
+ linkid = atoi (&li[1]);
+ } else {
+ if (types[0] == 'f') {
+ linkid = (int) argv[0]->f;
+ } else if (types[0] == 'i') {
+ linkid = argv[0]->i;
+ }
+ }
+ } else {
+ if (types[0] == 'f') {
+ linkset = (int) argv[0]->f;
+ } else if (types[0] == 'i') {
+ linkset = argv[0]->i;
+ }
+ }
} else {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
pi_page = (int) argv[0]->f;
- } else if (argv[0]->i) {
+ } else if (types[0] == 'i') {
pi_page = argv[0]->i;
}
}
} else {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
se_page = (int) argv[0]->f;
- } else if (argv[0]->i) {
+ } else if (types[0] == 'i') {
se_page = argv[0]->i;
}
}
} else {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
fadermode = (int) argv[0]->f;
- } else if (argv[0]->i) {
+ } else if (types[0] == 'i') {
fadermode = argv[0]->i;
}
}
} else {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
feedback = (int) argv[0]->f;
- } else if (argv[0]->i) {
+ } else if (types[0] == 'i') {
feedback = argv[0]->i;
}
}
} else {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
strip_types = (int) argv[0]->f;
- } else if (argv[0]->i) {
+ } else if (types[0] == 'i') {
strip_types = argv[0]->i;
}
}
ret = set_surface (bank_size, strip_types, feedback, fadermode, se_page, pi_page, msg);
+ if ((uint32_t) linkset != sur->linkset) {
+ set_link (linkset, linkid, get_address (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));
+ if (observer_busy) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg), true);
s->bank_size = b_size;
+ if (s->custom_mode && b_size) {
+ s->custom_mode = s->custom_mode | 0x4;
+ }
s->strip_types = strips;
s->feedback = fb;
s->gainmode = gm;
+ if (s->strip_types[10]) {
+ s->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ s->usegroup = PBD::Controllable::NoGroup;
+ }
s->send_page_size = se_size;
s->plug_page_size = pi_size;
- // set bank and strip feedback
- set_bank(s->bank, msg);
+ if (s->linkset) {
+ set_link (s->linkset, s->linkid, get_address (msg));
+ link_strip_types (s->linkset, s->strip_types.to_ulong());
+ } else {
+ // set bank and strip feedback
+ strip_feedback(s, true);
+ _set_bank (1, get_address (msg));
+ }
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ global_feedback (s);
sel_send_pagesize (se_size, msg);
sel_plug_pagesize (pi_size, msg);
return 0;
int
OSC::set_surface_bank_size (uint32_t bs, lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ if (observer_busy) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg), true);
s->bank_size = bs;
-
- // set bank and strip feedback
- set_bank(s->bank, msg);
+ if (s->custom_mode && bs) {
+ s->custom_mode = s->custom_mode | 0x4;
+ }
+ if (s->linkset) {
+ set_link (s->linkset, s->linkid, get_address (msg));
+ } else {
+ // set bank and strip feedback
+ _set_bank (1, get_address (msg));
+ }
return 0;
}
int
OSC::set_surface_strip_types (uint32_t st, lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ if (observer_busy) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg), true);
s->strip_types = st;
+ if (s->strip_types[10]) {
+ s->usegroup = PBD::Controllable::UseGroup;
+ } else {
+ s->usegroup = PBD::Controllable::NoGroup;
+ }
+ if (s->linkset) {
+ link_strip_types (s->linkset, st);
+ }
// set bank and strip feedback
- set_bank(s->bank, msg);
+ _set_bank (1, get_address (msg));
return 0;
}
int
OSC::set_surface_feedback (uint32_t fb, lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ if (observer_busy) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg), true);
s->feedback = fb;
- // set bank and strip feedback
- set_bank(s->bank, msg);
-
- // Set global/master feedback
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ strip_feedback (s, true);
+ global_feedback (s);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), get_address (msg));
return 0;
}
int
OSC::set_surface_gainmode (uint32_t gm, lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ if (observer_busy) {
+ return -1;
+ }
+ OSCSurface *s = get_surface(get_address (msg), true);
s->gainmode = gm;
- // set bank and strip feedback
- set_bank(s->bank, msg);
-
- // Set global/master feedback
- global_feedback (s->feedback, get_address (msg), s->gainmode);
+ strip_feedback (s, true);
+ global_feedback (s);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), get_address (msg));
return 0;
}
}
OSC::OSCSurface *
-OSC::get_surface (lo_address addr)
+OSC::get_surface (lo_address addr , bool quiet)
{
string r_url;
char * rurl;
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];
+ {
+ for (uint32_t it = 0; it < _surface.size(); ++it) {
+ //find setup for this surface
+ if (!_surface[it].remote_url.find(r_url)){
+ return &_surface[it];
+ }
}
}
s.no_clear = false;
s.jogmode = JOG;
s.bank = 1;
- s.bank_size = default_banksize; // need to find out how many strips there are
- s.strip_types = default_strip; // 159 is tracks, busses, and VCAs (no master/monitor)
+ s.bank_size = default_banksize;
+ s.observers.clear();
+ s.sel_obs = 0;
+ s.global_obs = 0;
+ s.strip_types = default_strip;
s.feedback = default_feedback;
s.gainmode = default_gainmode;
+ s.usegroup = PBD::Controllable::NoGroup;
+ s.custom_strips.clear ();
+ s.custom_mode = 0;
s.sel_obs = 0;
s.expand = 0;
s.expand_enable = false;
s.cue = false;
s.aux = 0;
- s.strips = get_sorted_stripables(s.strip_types, s.cue);
+ s.cue_obs = 0;
+ s.strips = get_sorted_stripables(s.strip_types, s.cue, false, s.custom_strips);
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.linkset = 0;
+ s.linkid = 1;
s.nstrips = s.strips.size();
- _surface.push_back (s);
- // moved this down here as selection may need s.<anything to do with select> set
- if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
- gui_selection_changed();
+ {
+ _surface.push_back (s);
}
- // set bank and strip feedback
- _set_bank(s.bank, addr);
-
- // Set global/master feedback
- global_feedback (s.feedback, addr, s.gainmode);
+ if (!quiet) {
+ strip_feedback (&s, true);
+ global_feedback (&s);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr);
+ }
return &_surface[_surface.size() - 1];
}
// setup global feedback for a surface
void
-OSC::global_feedback (bitset<32> feedback, lo_address addr, uint32_t gainmode)
+OSC::global_feedback (OSCSurface* sur)
+{
+ OSCGlobalObserver* o = sur->global_obs;
+ delete o;
+ if (sur->feedback[4] || sur->feedback[3] || sur->feedback[5] || sur->feedback[6]) {
+
+ // create a new Global Observer for this surface
+ OSCGlobalObserver* o = new OSCGlobalObserver (*this, *session, sur);
+ sur->global_obs = o;
+ }
+}
+
+void
+OSC::strip_feedback (OSCSurface* sur, bool new_bank_size)
{
- // first destroy global observer for this surface
- GlobalObservers::iterator x;
- for (x = global_observers.begin(); x != global_observers.end();) {
+ LinkSet *set;
+ uint32_t ls = sur->linkset;
- OSCGlobalObserver* ro;
+ if (ls) {
+ set = &(link_sets[ls]);
+ if (set->not_ready) {
+ return;
+ }
+ sur->custom_mode = set->custom_mode;
+ sur->custom_strips = set->custom_strips;
+ }
+ if (sur->custom_strips.size () == 0) {
+ sur->custom_mode = 0;
+ }
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue, sur->custom_mode, sur->custom_strips);
+ sur->nstrips = sur->strips.size();
+ if (ls) {
+ set->strips = sur->strips;
+ }
- if ((ro = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
+ if (new_bank_size || (!sur->feedback[0] && !sur->feedback[1])) {
+ // delete old observers
+ for (uint32_t i = 0; i < sur->observers.size(); i++) {
+ if (!sur->bank_size) {
+ sur->observers[i]->clear_strip ();
+ }
+ delete sur->observers[i];
+ }
+ sur->observers.clear();
- int res = strcmp(lo_address_get_url(ro->address()), lo_address_get_url(addr));
+ uint32_t bank_size = sur->bank_size;
+ if (!bank_size) {
+ bank_size = sur->nstrips;
+ }
- if (res == 0) {
- delete *x;
- x = global_observers.erase (x);
- } else {
- ++x;
+ if (sur->feedback[0] || sur->feedback[1]) {
+ for (uint32_t i = 0; i < bank_size; i++) {
+ OSCRouteObserver* o = new OSCRouteObserver (*this, i + 1, sur);
+ sur->observers.push_back (o);
+ }
+ }
+ } else {
+ if (sur->feedback[0] || sur->feedback[1]) {
+ for (uint32_t i = 0; i < sur->observers.size(); i++) {
+ boost::shared_ptr<ARDOUR::Stripable> str = get_strip (i + 1, lo_address_new_from_url (sur->remote_url.c_str()));
+ sur->observers[i]->refresh_strip(str, true);
}
- } else {
- ++x;
}
}
- if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
- // create a new Global Observer for this surface
- OSCGlobalObserver* o = new OSCGlobalObserver (*session, addr, gainmode, /*s->*/feedback);
- global_observers.push_back (o);
- }
+ bank_leds (sur);
}
void
void
OSC::_recalcbanks ()
{
- if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
- _select = ControlProtocol::first_selected_stripable();
+ if (observer_busy) {
+ return;
}
-
- // do a set_bank for each surface we know about.
+ /*
+ * We have two different ways of working here:
+ * 1) banked: The controller has a bank of strips and only can deal
+ * with banksize strips. We start banksize observers which run until
+ * either banksize is changed or Ardour exits.
+ *
+ * 2) banksize is 0 or unlimited and so is the same size as the number
+ * of strips. For a recalc, We want to tear down all strips but not send
+ * a reset value for any of the controls and then rebuild all observers.
+ * this is easier than detecting change in "bank" size and deleting or
+ * adding just a few.
+ */
+
+ // refresh each surface we know about.
for (uint32_t it = 0; it < _surface.size(); ++it) {
OSCSurface* sur = &_surface[it];
// find lo_address
lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
if (sur->cue) {
_cue_set (sur->aux, addr);
- } else {
- _set_bank (sur->bank, addr);
- }
- if (sur->no_clear) {
+ } else if (!sur->bank_size) {
+ strip_feedback (sur, true);
// This surface uses /strip/list tell it routes have changed
lo_message reply;
reply = lo_message_new ();
lo_send_message (addr, "/strip/list", reply);
lo_message_free (reply);
+ } else {
+ strip_feedback (sur, false);
}
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr);
}
}
-/*
- * This gets called not only when bank changes but also:
- * - bank size change
- * - feedback change
- * - strip types changes
- * - fadermode changes
- * - stripable creation/deletion/flag
- * - to refresh what is "displayed"
- * Basically any time the bank needs to be rebuilt
- */
int
OSC::set_bank (uint32_t bank_start, lo_message msg)
{
if (!session) {
return -1;
}
- // no nstripables yet
if (!session->nroutes()) {
return -1;
}
- OSCSurface *s = get_surface (addr);
+ OSCSurface *s = get_surface (addr, true);
- // revert any expand to select
- s->expand = 0;
- s->expand_enable = false;
- _strip_select (ControlProtocol::first_selected_stripable(), addr);
+ Sorted striplist = s->strips;
+ uint32_t nstrips = s->nstrips;
- // undo all listeners for this url
- StripableList stripables;
- session->get_stripables (stripables);
- for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+ LinkSet *set;
+ uint32_t ls = s->linkset;
- boost::shared_ptr<Stripable> stp = *it;
- if (stp) {
- end_listen (stp, addr);
+ if (ls) {
+ //we have a linkset... deal with each surface
+ set = &(link_sets[ls]);
+ if (set->not_ready) {
+ return 1;
}
- // slow devices need time to clear buffers
- usleep ((uint32_t) 10);
+ uint32_t d_count = set->urls.size();
+ set->strips = striplist;
+ bank_start = bank_limits_check (bank_start, set->banksize, nstrips);
+ set->bank = bank_start;
+ uint32_t not_ready = 0;
+ for (uint32_t dv = 1; dv < d_count; dv++) {
+ OSCSurface *sur;
+ if (set->urls[dv] != "") {
+ string url = set->urls[dv];
+ sur = get_surface (lo_address_new_from_url (url.c_str()));
+ } else {
+ not_ready = dv;
+ }
+ if (sur->linkset != ls) {
+ set->urls[dv] = "";
+ not_ready = dv;
+ }
+ if (not_ready) {
+ if (!set->not_ready) {
+ set->not_ready = not_ready;
+ }
+ set->bank = 1;
+ break;
+ }
+ lo_address sur_addr = lo_address_new_from_url (sur->remote_url.c_str());
+
+ sur->bank = bank_start;
+ bank_start = bank_start + sur->bank_size;
+ strip_feedback (sur, false);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), sur_addr);
+ bank_leds (sur);
+ lo_address_free (sur_addr);
+ }
+ if (not_ready) {
+ surface_link_state (set);
+ }
+
+ } else {
+
+ s->bank = bank_limits_check (bank_start, s->bank_size, nstrips);
+ strip_feedback (s, true);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr);
+ bank_leds (s);
}
- s->strips = get_sorted_stripables(s->strip_types, s->cue);
- s->nstrips = s->strips.size();
+ bank_dirty = false;
+ tick = true;
+ return 0;
+}
+
+uint32_t
+OSC::bank_limits_check (uint32_t bank, uint32_t size, uint32_t total)
+{
uint32_t b_size;
- if (!s->bank_size) {
+ if (!size) {
// no banking - bank includes all stripables
- b_size = s->nstrips;
+ b_size = total;
} else {
- b_size = s->bank_size;
+ b_size = size;
}
-
// Do limits checking
- if (bank_start < 1) bank_start = 1;
- if (b_size >= s->nstrips) {
- bank_start = 1;
- } else if (bank_start > ((s->nstrips - b_size) + 1)) {
+ if (bank < 1) bank = 1;
+ if (b_size >= total) {
+ bank = 1;
+ } else if (bank > ((total - b_size) + 1)) {
// top bank is always filled if there are enough strips for at least one bank
- bank_start = (uint32_t)((s->nstrips - b_size) + 1);
+ bank = (uint32_t)((total - b_size) + 1);
}
- //save bank after bank limit checks
- s->bank = bank_start;
-
- if (s->feedback[0] || s->feedback[1]) {
-
- for (uint32_t n = bank_start; n < (min ((b_size + bank_start), s->nstrips + 1)); ++n) {
- if (n <= s->strips.size()) {
- boost::shared_ptr<Stripable> stp = s->strips[n - 1];
+ return bank;
+}
- if (stp) {
- listen_to_route(stp, addr);
- }
- }
- // slow devices need time to clear buffers
- usleep ((uint32_t) 20);
+void
+OSC::bank_leds (OSCSurface* s)
+{
+ uint32_t bank = 0;
+ uint32_t size = 0;
+ uint32_t total = 0;
+ // light bankup or bankdown buttons if it is possible to bank in that direction
+ lo_address addr = lo_address_new_from_url (s->remote_url.c_str());
+ if (s->linkset) {
+ LinkSet *set;
+ set = &(link_sets[s->linkset]);
+ bank = set->bank;
+ size = set->banksize;
+ total = s->nstrips;
+ if (set->not_ready) {
+ total = 1;
}
+ } else {
+ bank = s->bank;
+ size = s->bank_size;
+ total = s->nstrips;
}
- // light bankup or bankdown buttons if it is possible to bank in that direction
- if (s->feedback[4] && !s->no_clear) {
+ if (size && (s->feedback[0] || s->feedback[1] || s->feedback[4])) {
lo_message reply;
reply = lo_message_new ();
- if ((s->bank > (s->nstrips - s->bank_size)) || (s->nstrips < s->bank_size)) {
+ if ((total <= size) || (bank > (total - size))) {
lo_message_add_int32 (reply, 0);
} else {
lo_message_add_int32 (reply, 1);
lo_send_message (addr, "/bank_up", reply);
lo_message_free (reply);
reply = lo_message_new ();
- if (s->bank > 1) {
+ if (bank > 1) {
lo_message_add_int32 (reply, 1);
} else {
lo_message_add_int32 (reply, 0);
lo_send_message (addr, "/bank_down", reply);
lo_message_free (reply);
}
- bank_dirty = false;
- tick = true;
- return 0;
}
int
OSC::bank_up (lo_message msg)
{
- if (!session) {
- return -1;
- }
- OSCSurface *s = get_surface(get_address (msg));
- set_bank (s->bank + s->bank_size, msg);
- return 0;
+ return bank_delta (1.0, msg);
}
int
if (!session) {
return -1;
}
+ // only do deltas of -1 0 or 1
+ if (delta > 0) {
+ delta = 1;
+ } else if (delta < 0) {
+ delta = -1;
+ } else {
+ // 0 key release ignore
+ return 0;
+ }
OSCSurface *s = get_surface(get_address (msg));
- uint32_t new_bank = s->bank + (s->bank_size * (int) delta);
+ if (!s->bank_size) {
+ // bank size of 0 means use all strips no banking
+ return 0;
+ }
+ uint32_t old_bank = 0;
+ uint32_t bank_size = 0;
+ if (s->linkset) {
+ old_bank = link_sets[s->linkset].bank;
+ bank_size = link_sets[s->linkset].banksize;
+ } else {
+ old_bank = s->bank;
+ bank_size = s->bank_size;
+ }
+ uint32_t new_bank = old_bank + (bank_size * (int) delta);
if ((int)new_bank < 1) {
new_bank = 1;
}
- if (new_bank != s->bank) {
+ if (new_bank != old_bank) {
set_bank (new_bank, msg);
}
return 0;
int
OSC::bank_down (lo_message msg)
+{
+ return bank_delta (-1.0, msg);
+}
+
+int
+OSC::use_group (float value, lo_message msg)
{
if (!session) {
return -1;
}
OSCSurface *s = get_surface(get_address (msg));
- if (s->bank < s->bank_size) {
- set_bank (1, msg);
+ if (value) {
+ s->usegroup = PBD::Controllable::UseGroup;
} else {
- set_bank (s->bank - s->bank_size, msg);
+ s->usegroup = PBD::Controllable::NoGroup;
}
return 0;
}
OSCSurface *s = get_surface(get_address (msg));
if (size != s->send_page_size) {
s->send_page_size = size;
- s->sel_obs->renew_sends();
+ s->sel_obs->set_send_size(size);
}
return 0;
}
OSC::sel_send_page (int page, lo_message msg)
{
OSCSurface *s = get_surface(get_address (msg));
+ uint32_t send_size = s->send_page_size;
+ if (!send_size) {
+ send_size = s->nsends;
+ }
+ uint32_t max_page = (uint32_t)(s->nsends / send_size) + 1;
s->send_page = s->send_page + page;
- s->sel_obs->renew_sends();
+ if (s->send_page < 1) {
+ s->send_page = 1;
+ } else if ((uint32_t)s->send_page > max_page) {
+ s->send_page = max_page;
+ }
+ s->sel_obs->set_send_page (s->send_page);
return 0;
}
OSCSurface *s = get_surface(get_address (msg));
if (size != s->plug_page_size) {
s->plug_page_size = size;
- s->sel_obs->renew_plugin();
+ s->sel_obs->set_plugin_size(size);
}
return 0;
}
int
OSC::sel_plug_page (int page, lo_message msg)
{
+ if (!page) {
+ return 0;
+ }
+ int new_page = 0;
OSCSurface *s = get_surface(get_address (msg));
- s->plug_page = s->plug_page + page;
- s->sel_obs->renew_plugin();
+ if (page > 0) {
+ new_page = s->plug_page + s->plug_page_size;
+ if ((uint32_t) new_page > s->plug_params.size ()) {
+ new_page = s->plug_page;
+ }
+ } else {
+ new_page = s->plug_page - s->plug_page_size;
+ if (new_page < 1) {
+ new_page = 1;
+ }
+ }
+ if (new_page != s->plug_page) {
+ s->plug_page = new_page;
+ s->sel_obs->set_plugin_page(s->plug_page);
+ }
return 0;
}
int
OSC::sel_plugin (int delta, lo_message msg)
{
+ if (!delta) {
+ return 0;
+ }
OSCSurface *sur = get_surface(get_address (msg));
return _sel_plugin (sur->plugin_id + delta, get_address (msg));
}
OSC::_sel_plugin (int id, lo_address addr)
{
OSCSurface *sur = get_surface(addr);
- boost::shared_ptr<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, addr);
- } else {
- s = _select;
- }
+ boost::shared_ptr<Stripable> s = sur->select;
if (s) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
if (!r) {
if (!pi->is_channelstrip()) {
#endif
sur->plugins.push_back (nplugs);
+ nplugs++;
#ifdef MIXBUS
}
}
#endif
}
plugs = true;
- nplugs++;
}
} while (plugs);
// limit plugin_id to actual plugins
- if (!sur->plugins.size()) {
+ if (sur->plugins.size() < 1) {
sur->plugin_id = 0;
+ sur->plug_page = 1;
+ if (sur->sel_obs) {
+ sur->sel_obs->set_plugin_id(-1, 1);
+ }
return 0;
+ } else if (id < 1) {
+ sur->plugin_id = 1;
} 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;
}
sur->plug_page = 1;
if (sur->sel_obs) {
- sur->sel_obs->renew_plugin();
+ sur->sel_obs->set_plugin_id(sur->plugins[sur->plugin_id - 1], sur->plug_page);
}
return 0;
}
}
void
-OSC::transport_frame (lo_message msg)
+OSC::transport_sample (lo_message msg)
{
if (!session) {
return;
}
check_surface (msg);
- framepos_t pos = session->transport_frame ();
+ samplepos_t pos = session->transport_sample ();
lo_message reply = lo_message_new ();
lo_message_add_int64 (reply, pos);
if (!session) return -1;
check_surface (msg);
- scrub_place = session->transport_frame ();
+ scrub_place = session->transport_sample ();
float speed;
if (speed == 1) {
session->request_transport_speed (.5);
} else {
- session->request_transport_speed (1);
+ session->request_transport_speed (9.9);
}
} else if (speed < 0) {
if (speed == -1) {
text_message (path, "Shuttle", get_address (msg));
if (delta) {
double speed = get_transport_speed ();
- set_transport_speed (speed + (delta / 8));
+ set_transport_speed (speed + (delta / 8.1));
} else {
set_transport_speed (0);
}
if (!session) return -1;
OSCSurface *s = get_surface(get_address (msg));
+ if (get_transport_speed () != 1.0) {
+ set_transport_speed (0);
+ }
switch((uint32_t)mode)
{
case JOG :
+ text_message ("/jog/mode/name", "Jog", get_address (msg));
s->jogmode = JOG;
break;
case SCRUB:
+ text_message ("/jog/mode/name", "Scrub", get_address (msg));
s->jogmode = SCRUB;
break;
case SHUTTLE:
+ text_message ("/jog/mode/name", "Shuttle", get_address (msg));
s->jogmode = SHUTTLE;
break;
case SCROLL:
+ text_message ("/jog/mode/name", "Scroll", get_address (msg));
s->jogmode = SCROLL;
break;
case TRACK:
+ text_message ("/jog/mode/name", "Track", get_address (msg));
s->jogmode = TRACK;
break;
case BANK:
+ text_message ("/jog/mode/name", "Bank", get_address (msg));
s->jogmode = BANK;
break;
case NUDGE:
+ text_message ("/jog/mode/name", "Nudge", get_address (msg));
s->jogmode = NUDGE;
break;
case MARKER:
+ text_message ("/jog/mode/name", "Marker", get_address (msg));
s->jogmode = MARKER;
break;
default:
PBD::warning << "Jog Mode: " << mode << " is not valid." << endmsg;
break;
+ }
lo_message reply = lo_message_new ();
lo_message_add_int32 (reply, s->jogmode);
lo_send_message (get_address(msg), "/jog/mode", reply);
lo_message_free (reply);
- }
- jog (0, msg);
return 0;
}
+// two structs to help with going to markers
+struct LocationMarker {
+ LocationMarker (const std::string& l, samplepos_t w)
+ : label (l), when (w) {}
+ std::string label;
+ samplepos_t when;
+};
+
+struct LocationMarkerSort {
+ bool operator() (const LocationMarker& a, const LocationMarker& b) {
+ return (a.when < b.when);
+ }
+};
+
+int
+OSC::set_marker (const char* types, lo_arg **argv, int argc, lo_message msg)
+{
+ if (argc != 1) {
+ PBD::warning << "Wrong number of parameters, one only." << endmsg;
+ return -1;
+ }
+ const Locations::LocationList& ll (session->locations ()->list ());
+ uint32_t marker = 0;
+
+ switch (types[0]) {
+ case 's':
+ for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
+ if ((*l)->is_mark ()) {
+ if (strcmp (&argv[0]->s, (*l)->name().c_str()) == 0) {
+ session->request_locate ((*l)->start (), false);
+ return 0;
+ }
+ }
+ }
+ break;
+ case 'i':
+ marker = (uint32_t) argv[0]->i - 1;
+ break;
+ case 'f':
+ marker = (uint32_t) argv[0]->f - 1;
+ break;
+ default:
+ return -1;
+ break;
+ }
+ std::vector<LocationMarker> lm;
+ // get Locations that are marks
+ for (Locations::LocationList::const_iterator l = ll.begin(); l != ll.end(); ++l) {
+ if ((*l)->is_mark ()) {
+ lm.push_back (LocationMarker((*l)->name(), (*l)->start ()));
+ }
+ }
+ // sort them by position
+ LocationMarkerSort location_marker_sort;
+ std::sort (lm.begin(), lm.end(), location_marker_sort);
+ // go there
+ if (marker < lm.size()) {
+ session->request_locate (lm[marker].when, false);
+ return 0;
+ }
+ // we were unable to deal with things
+ return -1;
+}
+
+int
+OSC::click_level (float position)
+{
+ if (!session) return -1;
+ if (session->click_gain()->gain_control()) {
+ session->click_gain()->gain_control()->set_value (session->click_gain()->gain_control()->interface_to_internal (position), PBD::Controllable::NoGroup);
+ }
+ return 0;
+}
+
// master and monitor calls
int
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<Stripable> 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;
return 0;
}
+int
+OSC::master_select (lo_message msg)
+{
+ if (!session) {
+ return -1;
+ }
+ OSCSurface *sur = get_surface(get_address (msg));
+ sur->expand_enable = false;
+ boost::shared_ptr<Stripable> s = session->master_out();
+ if (s) {
+ SetStripableSelection (s);
+ }
+
+ return 0;
+}
+
int
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<Stripable> 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;
boost::shared_ptr<RouteList> route_list = session->get_routes();
lo_message reply = lo_message_new();
+ lo_message_add_int32(reply, rid);
for (RouteList::iterator i = route_list->begin(); i != route_list->end(); ++i) {
boost::shared_ptr<Route> tr = boost::dynamic_pointer_cast<Route> (*i);
uint32_t ssid;
if (argc) {
- if (argv[argc - 1]->f) {
+ if (types[argc - 1] == 'f') {
aut = (int)argv[argc - 1]->f;
} else {
aut = argv[argc - 1]->i;
if (sur->expand_enable && sur->expand) {
strp = get_strip (sur->expand, get_address (msg));
} else {
- strp = ControlProtocol::first_selected_stripable();
+ strp = _select;
}
ctr = 8;
} else {
uint32_t ssid;
if (argc) {
- if (argv[argc - 1]->f) {
+ if (types[argc - 1] == 'f') {
touch = (int)argv[argc - 1]->f;
} else {
touch = argv[argc - 1]->i;
if (sur->expand_enable && sur->expand) {
strp = get_strip (sur->expand, get_address (msg));
} else {
- strp = ControlProtocol::first_selected_stripable();
+ strp = _select;
}
ctr = 8;
} else {
if (control) {
if (touch) {
//start touch
- if (control->automation_state() == Touch && !control->touching ()) {
- control->start_touch (control->session().transport_frame());
- }
+ control->start_touch (control->session().transport_sample());
ret = 0;
} else {
// end touch
- control->stop_touch (true, control->session().transport_frame());
+ control->stop_touch (control->session().transport_sample());
ret = 0;
}
// just in case some crazy surface starts sending control values before touch
if (ctrl) {
//start touch
if (ctrl->automation_state() == Touch && !ctrl->touching ()) {
- ctrl->start_touch (ctrl->session().transport_frame());
+ ctrl->start_touch (ctrl->session().transport_sample());
_touch_timeout[ctrl] = 10;
}
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->mute_control()) {
- s->mute_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->mute_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
- return route_send_fail ("mute", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/mute", ssid, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("mute", 0, get_address (msg));
+ return float_message("/select/mute", 0, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_control()) {
- s->solo_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
}
}
- return route_send_fail ("solo", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/solo", ssid, 0, sur->feedback[2], get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_isolate_control()) {
- s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_isolate_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
- return route_send_fail ("solo_iso", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/solo_iso", ssid, 0, sur->feedback[2], get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->solo_safe_control()) {
- s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->solo_safe_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
- return route_send_fail ("solo_safe", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/solo_safe", ssid, 0, sur->feedback[2], get_address (msg));
}
int
session->set_control (s->solo_control(), yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
}
}
- return sel_fail ("solo", 0, get_address (msg));
+ return float_message("/select/solo", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("solo_iso", 0, get_address (msg));
+ return float_message("/select/solo_iso", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("solo_safe", 0, get_address (msg));
+ return float_message("/select/solo_safe", 0, get_address (msg));
}
int
}
}
}
- return sel_fail ("recenable", 0, get_address (msg));
+ return float_message("/select/recenable", 0, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->rec_enable_control()) {
- s->rec_enable_control()->set_value (yn, PBD::Controllable::UseGroup);
+ s->rec_enable_control()->set_value (yn, sur->usegroup);
if (s->rec_enable_control()->get_value()) {
return 0;
}
}
}
- return route_send_fail ("recenable", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/recenable", ssid, 0, sur->feedback[2], get_address (msg));
}
int
}
}
}
- return sel_fail ("record_safe", 0, get_address (msg));
+ return float_message("/select/record_safe", 0, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->rec_safe_control()) {
- s->rec_safe_control()->set_value (yn, PBD::Controllable::UseGroup);
+ s->rec_safe_control()->set_value (yn, sur->usegroup);
if (s->rec_safe_control()->get_value()) {
return 0;
}
}
}
- return route_send_fail ("record_safe", ssid, 0,get_address (msg));
+ return float_message_with_id ("/strip/record_safe", ssid, 0, sur->feedback[2], get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ std::bitset<32> value = track->monitoring_control()->get_value ();
+ value[0] = yn ? 1 : 0;
+ track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup);
return 0;
}
}
}
- return route_send_fail ("monitor_input", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/monitor_input", ssid, 0, sur->feedback[2], get_address (msg));
}
int
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ std::bitset<32> value = track->monitoring_control()->get_value ();
+ value[0] = yn ? 1 : 0;
+ track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup);
return 0;
}
}
}
- return sel_fail ("monitor_input", 0, get_address (msg));
+ return float_message("/select/monitor_input", 0, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+ std::bitset<32> value = track->monitoring_control()->get_value ();
+ value[1] = yn ? 1 : 0;
+ track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup);
return 0;
}
}
}
- return route_send_fail ("monitor_disk", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/monitor_disk", ssid, 0, sur->feedback[2], get_address (msg));
}
int
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (s);
if (track) {
if (track->monitoring_control()) {
- track->monitoring_control()->set_value (yn ? 2.0 : 0.0, PBD::Controllable::NoGroup);
+ std::bitset<32> value = track->monitoring_control()->get_value ();
+ value[1] = yn ? 1 : 0;
+ track->monitoring_control()->set_value (value.to_ulong(), sur->usegroup);
return 0;
}
}
}
- return sel_fail ("monitor_disk", 0, get_address (msg));
+ return float_message("/select/monitor_disk", 0, get_address (msg));
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->phase_control()) {
- s->phase_control()->set_value (yn ? 1.0 : 0.0, PBD::Controllable::NoGroup);
+ s->phase_control()->set_value (yn ? 1.0 : 0.0, sur->usegroup);
return 0;
}
}
- return route_send_fail ("polarity", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/polarity", ssid, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("polarity", 0, get_address (msg));
+ return float_message("/select/polarity", 0, get_address (msg));
}
int
if (yn) {
s = get_strip (ssid, get_address (msg));
} else {
- s = ControlProtocol::first_selected_stripable();
+ s = _select;
}
return _strip_select (s, get_address (msg));
}
+int
+OSC::strip_hide (int ssid, int state, lo_message msg)
+{
+ boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+
+ if (s) {
+ if (state != s->is_hidden ()) {
+ s->presentation_info().set_hidden ((bool) state);
+ }
+ }
+ return 0;
+}
+
int
OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
{
if (!session) {
return -1;
}
- OSCSurface *sur = get_surface(addr);
- if (sur->sel_obs) {
- delete sur->sel_obs;
- sur->sel_obs = 0;
- }
- bool feedback_on = sur->feedback.to_ulong();
- if (s && feedback_on) {
- 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) {
+ OSCSurface *sur = get_surface(addr, true);
+ if (!s) {
// expand doesn't point to a stripable, turn it off and use select
sur->expand = 0;
sur->expand_enable = false;
- if (_select && feedback_on) {
- 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;
+ if (ControlProtocol::first_selected_stripable()) {
+ s = ControlProtocol::first_selected_stripable();
+ } else {
+ s = session->master_out ();
}
- } 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<Route> r = boost::dynamic_pointer_cast<Route>(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;
- }
- //update buttons on surface
- int b_s = sur->bank_size;
- if (!b_s) { // bank size 0 means we need to know how many strips there are.
- b_s = sur->nstrips;
+ _select = s;
}
- for (int i = 1; i <= b_s; i++) {
- string path = "expand";
-
- if ((i == (int) sur->expand) && sur->expand_enable) {
- lo_message reply = lo_message_new ();
- if (sur->feedback[2]) {
- ostringstream os;
- os << "/strip/" << path << "/" << i;
- path = os.str();
- } else {
- ostringstream os;
- os << "/strip/" << path;
- path = os.str();
- lo_message_add_int32 (reply, i);
- }
- lo_message_add_float (reply, (float) 1);
+ sur->select = s;
+ bool sends;
+ uint32_t nsends = 0;
+ do {
+ sends = false;
+ if (s->send_level_controllable (nsends)) {
+ sends = true;
+ nsends++;
+ }
+ } while (sends);
+ sur->nsends = nsends;
- lo_send_message (addr, path.c_str(), reply);
- lo_message_free (reply);
- reply = lo_message_new ();
- lo_message_add_float (reply, 1.0);
- lo_send_message (addr, "/select/expand", reply);
- lo_message_free (reply);
+ s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
+ OSCSelectObserver* so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs);
+ if (sur->feedback[13]) {
+ if (so != 0) {
+ so->refresh_strip (s, nsends, sur->gainmode, true);
} else {
- lo_message reply = lo_message_new ();
- lo_message_add_int32 (reply, i);
- lo_message_add_float (reply, 0.0);
- lo_send_message (addr, "/strip/expand", reply);
- lo_message_free (reply);
+ OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, sur);
+ sur->sel_obs = sel_fb;
+ }
+ sur->sel_obs->set_expand (sur->expand_enable);
+ uint32_t obs_expand = 0;
+ if (sur->expand_enable) {
+ obs_expand = sur->expand;
+ } else {
+ obs_expand = 0;
+ }
+ for (uint32_t i = 0; i < sur->observers.size(); i++) {
+ sur->observers[i]->set_expand (obs_expand);
+ }
+ } else {
+ if (so != 0) {
+ delete so;
+ sur->sel_obs = 0;
}
}
- if (!sur->expand_enable) {
- lo_message reply = lo_message_new ();
- lo_message_add_float (reply, 0.0);
- lo_send_message (addr, "/select/expand", reply);
- lo_message_free (reply);
+ // need to set monitor for processor changed signal (for paging)
+ string address = lo_address_get_url (addr);
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
+ if (r) {
+ r->processors_changed.connect (sur->proc_connection, MISSING_INVALIDATOR, boost::bind (&OSC::processor_changed, this, address), this);
+ _sel_plugin (sur->plugin_id, addr);
}
return 0;
}
void
-OSC::processor_changed (lo_address addr)
+OSC::processor_changed (string address)
{
+ lo_address addr = lo_address_new_from_url (address.c_str());
OSCSurface *sur = get_surface (addr);
- sur->proc_connection.disconnect ();
_sel_plugin (sur->plugin_id, addr);
if (sur->sel_obs) {
sur->sel_obs->renew_sends ();
SetStripableSelection (s);
} else {
if ((int) (sur->feedback.to_ulong())) {
- route_send_fail ("select", ssid, 0, get_address (msg));
+ float_message_with_id ("/strip/select", ssid, 0, sur->feedback[2], get_address (msg));
}
}
{
OSCSurface *sur = get_surface(get_address (msg));
boost::shared_ptr<Stripable> s;
- sur->expand_enable = (bool) state;
if (state && sur->expand) {
+ sur->expand_enable = (bool) state;
s = get_strip (sur->expand, get_address (msg));
} else {
- s = ControlProtocol::first_selected_stripable();
+ sur->expand_enable = false;
+ s = _select;
}
return _strip_select (s, get_address (msg));
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->gain_control()) {
fake_touch (s->gain_control());
- s->gain_control()->set_value (level, PBD::Controllable::NoGroup);
+ s->gain_control()->set_value (level, sur->usegroup);
} else {
return 1;
}
OSC::route_set_gain_dB (int ssid, float dB, lo_message msg)
{
if (!session) {
- route_send_fail ("gain", ssid, -193, get_address (msg));
return -1;
}
+ OSCSurface *sur = get_surface(get_address (msg));
int ret;
if (dB < -192) {
ret = route_set_gain_abs (ssid, 0.0, msg);
ret = route_set_gain_abs (ssid, dB_to_coefficient (dB), msg);
}
if (ret != 0) {
- return route_send_fail ("gain", ssid, -193, get_address (msg));
+ return float_message_with_id ("/strip/gain", ssid, -193, sur->feedback[2], get_address (msg));
}
return 0;
}
}
if (s) {
float abs;
- if (val < -192) {
- abs = 0;
- } else {
- abs = dB_to_coefficient (val);
+ 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 float_message("/select/gain", -193, get_address (msg));
+}
+
+int
+OSC::sel_dB_delta (float delta, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
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;
}
}
- return sel_fail ("gain", -193, get_address (msg));
+ return float_message("/select/gain", -193, get_address (msg));
}
int
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(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);
+ s->gain_control()->set_value (s->gain_control()->interface_to_internal (pos), sur->usegroup);
} else {
- return route_send_fail ("fader", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg));
}
} else {
- return route_send_fail ("fader", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg));
}
return 0;
}
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
float db = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
float abs;
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);
+ s->gain_control()->set_value (abs, sur->usegroup);
return 0;
}
return -1;
return 0;
}
}
- return sel_fail ("fader", 0, get_address (msg));
+ return float_message("/select/fader", 0, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->trim_control()) {
- s->trim_control()->set_value (level, PBD::Controllable::NoGroup);
+ s->trim_control()->set_value (level, sur->usegroup);
return 0;
}
int
OSC::route_set_trim_dB (int ssid, float dB, lo_message msg)
{
+ OSCSurface *sur = get_surface(get_address (msg));
int ret;
ret = route_set_trim_abs(ssid, dB_to_coefficient (dB), msg);
if (ret != 0) {
- return route_send_fail ("trimdB", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/trimdB", ssid, 0, sur->feedback[2], get_address (msg));
}
return 0;
return 0;
}
}
- return sel_fail ("trimdB", 0, get_address (msg));
+ return float_message("/select/trimdB", 0, get_address (msg));
+}
+
+int
+OSC::sel_hide (uint32_t state, lo_message msg)
+{
+ OSCSurface *sur = get_surface(get_address (msg));
+ boost::shared_ptr<Stripable> s;
+ if (sur->expand_enable) {
+ s = get_strip (sur->expand, get_address (msg));
+ } else {
+ s = _select;
+ }
+ if (s) {
+ if (state != s->is_hidden ()) {
+ s->presentation_info().set_hidden ((bool) state);
+ }
+ }
+ return 0;
}
int
return 0;
}
}
- return sel_fail ("pan_stereo_position", 0.5, get_address (msg));
+ return float_message("/select/pan_stereo_position", 0.5, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("pan_stereo_width", 1, get_address (msg));
+ return float_message("/select/pan_stereo_width", 1, get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if(s->pan_azimuth_control()) {
- s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), PBD::Controllable::NoGroup);
+ s->pan_azimuth_control()->set_value (s->pan_azimuth_control()->interface_to_internal (pos), sur->usegroup);
return 0;
}
}
- return route_send_fail ("pan_stereo_position", ssid, 0.5, get_address (msg));
+ return float_message_with_id ("/strip/pan_stereo_position", ssid, 0.5, sur->feedback[2], get_address (msg));
}
int
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
if (s->pan_width_control()) {
- s->pan_width_control()->set_value (pos, PBD::Controllable::NoGroup);
+ s->pan_width_control()->set_value (pos, sur->usegroup);
return 0;
}
}
- return route_send_fail ("pan_stereo_width", ssid, 1, get_address (msg));
+ return float_message_with_id ("/strip/pan_stereo_width", ssid, 1, sur->feedback[2], get_address (msg));
}
int
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
float abs;
if (s) {
if (id > 0) {
}
#endif
if (s->send_level_controllable (id)) {
- s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ s->send_level_controllable (id)->set_value (abs, sur->usegroup);
return 0;
}
}
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
float abs;
if (s) {
if (s->send_level_controllable (id)) {
abs = s->send_level_controllable(id)->interface_to_internal (val);
- s->send_level_controllable (id)->set_value (abs, PBD::Controllable::NoGroup);
+ s->send_level_controllable (id)->set_value (abs, sur->usegroup);
return 0;
}
}
{
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));
+ return float_message_with_id ("/select/send_gain", id, -193, sur->feedback[2], get_address (msg));
}
boost::shared_ptr<Stripable> s;
if (sur->expand_enable) {
s = _select;
}
float abs;
- int send_id;
+ int send_id = 0;
if (s) {
if (id > 0) {
send_id = id - 1;
return 0;
}
}
- return sel_send_fail ("send_gain", id, -193, get_address (msg));
+ return float_message_with_id ("/select/send_gain", id, -193, sur->feedback[2], get_address (msg));
}
int
{
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));
+ return float_message_with_id ("/select/send_fader", id, 0, sur->feedback[2], get_address (msg));
}
boost::shared_ptr<Stripable> s;
if (sur->expand_enable) {
s = _select;
}
float abs;
- int send_id;
+ int send_id = 0;
if (s) {
if (id > 0) {
return 0;
}
}
- return sel_send_fail ("send_fader", id, 0, get_address (msg));
+ return float_message_with_id ("/select/send_fader", id, 0, sur->feedback[2], get_address (msg));
}
int
return -1;
}
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg));
if (s) {
}
if (s->send_enable_controllable (sid)) {
- s->send_enable_controllable (sid)->set_value (val, PBD::Controllable::NoGroup);
+ s->send_enable_controllable (sid)->set_value (val, sur->usegroup);
return 0;
}
{
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));
+ return float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], get_address (msg));
}
boost::shared_ptr<Stripable> s;
if (sur->expand_enable) {
} else {
s = _select;
}
- int send_id;
+ int send_id = 0;
if (s) {
if (id > 0) {
send_id = id - 1;
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
if (!r) {
// should never get here
- return sel_send_fail ("send_enable", id, 0, get_address (msg));
+ return float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], get_address (msg));
}
boost::shared_ptr<Send> snd = boost::dynamic_pointer_cast<Send> (r->nth_send(send_id));
if (snd) {
return 0;
}
}
- return sel_send_fail ("send_enable", id, 0, get_address (msg));
+ return float_message_with_id ("/select/send_enable", id, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return cue_float_message ("/select/master_send_enable", 0, get_address(msg));
+ return 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;
+ uint32_t piid = sur->plugin_id;
float value = 0;
if (argc > 1) {
// no inline args
if (argc == 2) {
// change parameter in already selected plugin
- if (argv[0]->f) {
+ if (types[0] == 'f') {
paid = (int) argv[0]->f;
} else {
paid = argv[0]->i;
}
value = argv[1]->f;
} else if (argc == 3) {
- if (argv[0]->f) {
+ if (types[0] == 'f') {
piid = (int) argv[0]->f;
} else {
piid = argv[0]->i;
}
_sel_plugin (piid, get_address (msg));
- if (argv[1]->f) {
+ if (types[1] == 'f') {
paid = (int) argv[1]->f;
} else {
paid = argv[1]->i;
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 (!piid || piid > sur->plugins.size ()) {
+ return float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg));
}
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<Stripable> s;
- if (sur->expand_enable) {
- s = get_strip (sur->expand, get_address (msg));
- } else {
- s = _select;
+ return float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg));
}
+ boost::shared_ptr<Stripable> s = sur->select;
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
if (!r) {
return 1;
}
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
// paid is paged parameter convert to absolute
- int parid = paid + (int)(sur->plug_page_size * (sur->plug_page - 1));
+ int parid = paid + (int)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));
+ float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg));
}
return 0;
}
return 1;
}
+int
+OSC::sel_plugin_activate (float state, lo_message msg)
+{
+ if (!session) {
+ return -1;
+ }
+ OSCSurface *sur = get_surface(get_address (msg));
+ if (sur->plugins.size() > 0) {
+ boost::shared_ptr<Stripable> s = sur->select;
+
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
+
+ if (r) {
+ boost::shared_ptr<Processor> redi=r->nth_plugin (sur->plugins[sur->plugin_id -1]);
+ if (redi) {
+ boost::shared_ptr<PluginInsert> pi;
+ if ((pi = boost::dynamic_pointer_cast<PluginInsert>(redi))) {
+ if(state > 0) {
+ pi->activate();
+ } else {
+ pi->deactivate();
+ }
+ return 0;
+ }
+ }
+ }
+ }
+ float_message ("/select/plugin/activate", 0, get_address (msg));
+ PBD::warning << "OSC: Select has no Plugin." << endmsg;
+ return 0;
+}
+
int
OSC::route_plugin_list (int ssid, lo_message msg) {
if (!session) {
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
lo_message_add_string (reply, pip->name());
+ lo_message_add_int32(reply, redi->enabled() ? 1 : 0);
piid++;
}
boost::shared_ptr<ARDOUR::Plugin> pip = pi->plugin();
bool ok = false;
- 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());
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<AutomationControl> 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;
- 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<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
+
+ lo_message reply = lo_message_new();
+ lo_message_add_int32 (reply, ssid);
+ lo_message_add_int32 (reply, piid);
+
+ 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;
+ flags |= pip->parameter_is_input(controlid) ? 0x80 : 0;
+
+ std::string param_desc = pi->plugin()->describe_parameter(Evoral::Parameter(PluginAutomation, 0, controlid));
+ flags |= (param_desc == X_("hidden")) ? 0x100 : 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_float (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);
+ }
+
+ lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply);
+ lo_message_free (reply);
}
- lo_send_message (get_address (msg), "/strip/plugin/descriptor", reply);
+ lo_message reply = lo_message_new ();
+ lo_message_add_int32 (reply, ssid);
+ lo_message_add_int32 (reply, piid);
+ lo_send_message (get_address (msg), "/strip/plugin/descriptor_end", reply);
lo_message_free (reply);
return 0;
return 0;
}
}
- return sel_fail ("pan_elevation_position", 0, get_address (msg));
+ return float_message("/select/pan_elevation_position", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("pan_frontback_position", 0.5, get_address (msg));
+ return float_message("/select/pan_frontback_position", 0.5, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("pan_lfe_control", 0, get_address (msg));
+ return float_message("/select/pan_lfe_control", 0, get_address (msg));
}
// compressor control
return 0;
}
}
- return sel_fail ("comp_enable", 0, get_address (msg));
+ return float_message("/select/comp_enable", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("comp_threshold", 0, get_address (msg));
+ return float_message("/select/comp_threshold", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("comp_speed", 0, get_address (msg));
+ return float_message("/select/comp_speed", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("comp_mode", 0, get_address (msg));
+ return float_message("/select/comp_mode", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("comp_makeup", 0, get_address (msg));
+ return float_message("/select/comp_makeup", 0, get_address (msg));
}
// EQ control
return 0;
}
}
- return sel_fail ("eq_enable", 0, get_address (msg));
+ return float_message("/select/eq_enable", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_hpf/freq", 0, get_address (msg));
+ return float_message("/select/eq_hpf/freq", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_lpf/freq", 0, get_address (msg));
+ return float_message("/select/eq_lpf/freq", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_hpf/enable", 0, get_address (msg));
+ return float_message("/select/eq_hpf/enable", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_lpf/enable", 0, get_address (msg));
+ return float_message("/select/eq_lpf/enable", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_hpf/slope", 0, get_address (msg));
+ return float_message("/select/eq_hpf/slope", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("eq_lpf/slope", 0, get_address (msg));
+ return float_message("/select/eq_lpf/slope", 0, get_address (msg));
}
int
return 0;
}
}
- return sel_send_fail ("eq_gain", id + 1, 0, get_address (msg));
+ return float_message_with_id ("/select/eq_gain", id + 1, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return sel_send_fail ("eq_freq", id + 1, 0, get_address (msg));
+ return float_message_with_id ("/select/eq_freq", id + 1, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return sel_send_fail ("eq_q", id + 1, 0, get_address (msg));
+ return float_message_with_id ("/select/eq_q", id + 1, 0, sur->feedback[2], get_address (msg));
}
int
return 0;
}
}
- return sel_send_fail ("eq_shape", id + 1, 0, get_address (msg));
-}
-
-void
-OSC::gui_selection_changed ()
-{
- boost::shared_ptr<Stripable> strip = ControlProtocol::first_selected_stripable();
-
- if (strip) {
- _select = strip;
- for (uint32_t it = 0; it < _surface.size(); ++it) {
- OSCSurface* sur = &_surface[it];
- if(!sur->expand_enable) {
- lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
- _strip_select (strip, addr);
- }
- }
- }
+ return float_message_with_id ("/select/eq_shape", id + 1, 0, sur->feedback[2], get_address (msg));
}
// timer callbacks
bool
OSC::periodic (void)
{
+ if (observer_busy) {
+ return true;
+ }
if (!tick) {
Glib::usleep(100); // let flurry of signals subside
if (global_init) {
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());
- global_feedback (sur->feedback, addr, sur->gainmode);
+ global_feedback (sur);
}
global_init = false;
tick = true;
bank_dirty = false;
tick = true;
}
+ return true;
}
if (scrub_speed != 0) {
session->request_locate (scrub_place, false);
}
}
-
- for (GlobalObservers::iterator x = global_observers.begin(); x != global_observers.end(); x++) {
-
- OSCGlobalObserver* go;
-
- if ((go = dynamic_cast<OSCGlobalObserver*>(*x)) != 0) {
- go->tick();
- }
- }
- for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end(); x++) {
-
- OSCRouteObserver* ro;
-
- if ((ro = dynamic_cast<OSCRouteObserver*>(*x)) != 0) {
- ro->tick();
- }
- }
for (uint32_t it = 0; it < _surface.size(); it++) {
OSCSurface* sur = &_surface[it];
OSCSelectObserver* so;
if ((so = dynamic_cast<OSCSelectObserver*>(sur->sel_obs)) != 0) {
- so->tick();
+ so->tick ();
}
- }
- for (CueObservers::iterator x = cue_observers.begin(); x != cue_observers.end(); x++) {
-
OSCCueObserver* co;
-
- if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
- co->tick();
+ if ((co = dynamic_cast<OSCCueObserver*>(sur->cue_obs)) != 0) {
+ co->tick ();
+ }
+ OSCGlobalObserver* go;
+ if ((go = dynamic_cast<OSCGlobalObserver*>(sur->global_obs)) != 0) {
+ go->tick ();
+ }
+ for (uint32_t i = 0; i < sur->observers.size(); i++) {
+ OSCRouteObserver* ro;
+ if ((ro = dynamic_cast<OSCRouteObserver*>(sur->observers[i])) != 0) {
+ ro->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<ARDOUR::AutomationControl> ctrl = (*x).first;
// turn touch off
- ctrl->stop_touch (true, ctrl->session().transport_frame());
+ ctrl->stop_touch (ctrl->session().transport_sample());
_touch_timeout.erase (x++);
} else {
x++;
return true;
}
-int
-OSC::route_send_fail (string path, uint32_t ssid, float val, lo_address addr)
-{
- OSCSurface *sur = get_surface(addr);
-
- ostringstream os;
- lo_message reply;
- if (ssid) {
- reply = lo_message_new ();
- if (sur->feedback[2]) {
- os << "/strip/" << path << "/" << ssid;
- } else {
- os << "/strip/" << path;
- lo_message_add_int32 (reply, ssid);
- }
- string str_pth = os.str();
- lo_message_add_float (reply, (float) val);
-
- lo_send_message (addr, str_pth.c_str(), reply);
- lo_message_free (reply);
- }
- if ((_select == get_strip (ssid, addr)) || ((sur->expand == ssid) && (sur->expand_enable))) {
- os.str("");
- os << "/select/" << path;
- string sel_pth = os.str();
- reply = lo_message_new ();
- lo_message_add_float (reply, (float) val);
- lo_send_message (addr, sel_pth.c_str(), reply);
- lo_message_free (reply);
- }
-
- return 0;
-}
-
-int
-OSC::sel_fail (string path, float val, lo_address addr)
-{
- ostringstream os;
- os.str("");
- os << "/select/" << path;
- string sel_pth = os.str();
- lo_message reply = lo_message_new ();
- lo_message_add_float (reply, (float) val);
- lo_send_message (addr, sel_pth.c_str(), reply);
- lo_message_free (reply);
-
- return 0;
-}
-
-int
-OSC::sel_send_fail (string path, uint32_t id, float val, lo_address addr)
-{
- OSCSurface *sur = get_surface(addr);
-
- ostringstream os;
- lo_message reply;
- reply = lo_message_new ();
- if (sur->feedback[2]) {
- os << "/select/" << path << "/" << id;
- } else {
- os << "/select/" << path;
- lo_message_add_int32 (reply, id);
- }
- string str_pth = os.str();
- lo_message_add_float (reply, (float) val);
-
- lo_send_message (addr, str_pth.c_str(), reply);
- lo_message_free (reply);
-
- return 0;
-}
-
XMLNode&
OSC::get_state ()
{
node.set_property ("gainmode", default_gainmode);
node.set_property ("send-page-size", default_send_size);
node.set_property ("plug-page-size", default_plugin_size);
- 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);
- devnode->set_property (X_("send-page-size"), sur->send_page_size);
- devnode->set_property (X_("plug-page-size"), sur->plug_page_size);
- devnode->set_property (X_("no-clear"), sur->no_clear);
- devnode->set_property (X_("cue"), sur->cue);
- devnode->set_property (X_("aux"), sur->aux);
- config->add_child_nocopy (*devnode);
- }
- node.add_child_nocopy (*config);
- }
return node;
}
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);
-
- (*d)->get_property (X_("send-page-size"), s.send_page_size);
- (*d)->get_property (X_("plug-page-size"), s.plug_page_size);
- (*d)->get_property (X_("no-clear"), s.no_clear);
- (*d)->get_property (X_("cue"), s.cue);
- (*d)->get_property (X_("aux"), s.aux);
- 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.jogmode = JOG;
- _surface.push_back (s);
- }
- }
global_init = true;
tick = false;
};
OSC::Sorted
-OSC::get_sorted_stripables(std::bitset<32> types, bool cue)
+OSC::get_sorted_stripables(std::bitset<32> types, bool cue, uint32_t custom, Sorted my_list)
{
Sorted sorted;
-
- // fetch all stripables
StripableList stripables;
+ StripableList custom_list;
+ // fetch all stripables
session->get_stripables (stripables);
-
+ if (custom) {
+ uint32_t nstps = my_list.size ();
+ // check each custom strip to see if it still exists
+ boost::shared_ptr<Stripable> s;
+ for (uint32_t i = 0; i < nstps; i++) {
+ bool exists = false;
+ s = my_list[i];
+ for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+ boost::shared_ptr<Stripable> sl = *it;
+ if (s == sl) {
+ exists = true;
+ break;
+ }
+ }
+ if(!exists) {
+ my_list[i] = boost::shared_ptr<Stripable>();
+ } else {
+ custom_list.push_back (s);
+ }
+ }
+ if (custom == 1) {
+ return my_list;
+ } else {
+ stripables = custom_list;
+ }
+ }
// Look for stripables that match bit in sur->strip_types
for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
boost::shared_ptr<Stripable> s = *it;
+ if (!s) {
+ break;
+ }
+ if (custom == 2) {
+ // banking off use all valid custom strips
+ sorted.push_back (s);
+ } else
if ((!cue) && (!types[9]) && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
// do nothing... skip it
+ } else if (types[8] && (s->is_selected())) {
+ sorted.push_back (s);
+ } else if (types[9] && (s->presentation_info().flags() & PresentationInfo::Hidden)) {
+ sorted.push_back (s);
+ } else if (s->is_master() || s->is_monitor() || s->is_auditioner()) {
+ // do nothing for these either (we add them later)
} else {
-
- if (types[0] && (s->presentation_info().flags() & PresentationInfo::AudioTrack)) {
+ if (types[0] && boost::dynamic_pointer_cast<AudioTrack>(s)) {
+ sorted.push_back (s);
+ } else if (types[1] && boost::dynamic_pointer_cast<MidiTrack>(s)) {
+ sorted.push_back (s);
+ } else if (types[4] && boost::dynamic_pointer_cast<VCA>(s)) {
sorted.push_back (s);
} else
- if (types[1] && (s->presentation_info().flags() & PresentationInfo::MidiTrack)) {
+#ifdef MIXBUS
+ if (types[2] && Profile->get_mixbus() && s->mixbus()) {
sorted.push_back (s);
} else
- if ((s->presentation_info().flags() & PresentationInfo::AudioBus)) {
- boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
- // r->feeds (session->master_out()) may make more sense
- if (r->direct_feeds_according_to_reality (session->master_out())) {
- // this is a bus
- if (types[2]) {
- sorted.push_back (s);
- }
- } else {
- // this is an Aux out
- if (types[7]) {
- sorted.push_back (s);
- }
+ if (types[7] && boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ if (Profile->get_mixbus() && !s->mixbus()) {
+ sorted.push_back (s);
}
- } else if (types[3] && (s->presentation_info().flags() & PresentationInfo::MidiBus)) {
- sorted.push_back (s);
- } else if (types[4] && (s->presentation_info().flags() & PresentationInfo::VCA)) {
- sorted.push_back (s);
- } else if (types[8] && (s->is_selected())) {
- sorted.push_back (s);
- } 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);
+ } else
+#endif
+ if ((types[2] || types[3] || types[7]) && boost::dynamic_pointer_cast<Route>(s) && !boost::dynamic_pointer_cast<Track>(s)) {
+ boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
+ if (!(s->presentation_info().flags() & PresentationInfo::MidiBus)) {
+ // note some older sessions will show midibuses as busses
+ if (r->direct_feeds_according_to_reality (session->master_out())) {
+ // this is a bus
+ if (types[2]) {
+ sorted.push_back (s);
+ }
+ } else {
+ // this is an Aux out
+ if (types[7]) {
+ sorted.push_back (s);
+ }
}
+ } else if (types[3]) {
+ sorted.push_back (s);
}
}
-#endif
}
}
- sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
- // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
- if (types[5]) {
- sorted.push_back (session->master_out());
+ if (!custom || (custom & 0x2)) {
+ sort (sorted.begin(), sorted.end(), StripableByPresentationOrder());
}
- if (types[6]) {
- sorted.push_back (session->monitor_out());
+ if (!custom) {
+ // Master/Monitor might be anywhere... we put them at the end - Sorry ;)
+ if (types[5]) {
+ sorted.push_back (session->master_out());
+ }
+ if (types[6]) {
+ if (session->monitor_out()) {
+ sorted.push_back (session->monitor_out());
+ }
+ }
}
return sorted;
}
int
OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
{
+ OSCSurface *s = get_surface(get_address (msg), true);
+ s->bank_size = 0;
+ float value = 0;
+ if (argc == 1) {
+ if (types[0] == 'f') {
+ value = argv[0]->f;
+ } else if (types[0] == 'i') {
+ value = (float) argv[0]->i;
+ }
+ }
int ret = 1; /* unhandled */
-
if (!strncmp (path, "/cue/aux", 8)) {
// set our Aux bus
- ret = cue_set (argv[0]->i, msg);
+ if (argc) {
+ if (value) {
+ ret = cue_set ((uint32_t) value, msg);
+ } else {
+ ret = 0;
+ }
+ }
}
else if (!strncmp (path, "/cue/connect", 12)) {
// Connect to default Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f || argv[0]->i) {
ret = cue_set (1, msg);
+ } else {
+ ret = 0;
}
}
else if (!strncmp (path, "/cue/next_aux", 13)) {
// switch to next Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f || argv[0]->i) {
ret = cue_next (msg);
+ } else {
+ ret = 0;
}
}
else if (!strncmp (path, "/cue/previous_aux", 17)) {
// switch to previous Aux bus
- if ((!argc) || argv[0]->i) {
+ if ((!argc) || argv[0]->f || argv[0]->i) {
ret = cue_previous (msg);
+ } else {
+ ret = 0;
}
}
else if (!strncmp (path, "/cue/send/fader/", 16) && strlen (path) > 16) {
- int id = atoi (&path[16]);
- ret = cue_send_fader (id, argv[0]->f, msg);
+ if (argc == 1) {
+ int id = atoi (&path[16]);
+ ret = cue_send_fader (id, value, msg);
+ }
}
else if (!strncmp (path, "/cue/send/enable/", 17) && strlen (path) > 17) {
- int id = atoi (&path[17]);
- ret = cue_send_enable (id, argv[0]->f, msg);
+ if (argc == 1) {
+ int id = atoi (&path[17]);
+ ret = cue_send_enable (id, value, msg);
+ }
}
else if (!strncmp (path, "/cue/fader", 10)) {
- ret = cue_aux_fader (argv[0]->f, msg);
+ if (argc == 1) {
+ ret = cue_aux_fader (value, msg);
+ }
}
else if (!strncmp (path, "/cue/mute", 9)) {
- ret = cue_aux_mute (argv[0]->f, msg);
+ if (argc == 1) {
+ ret = cue_aux_mute (value, msg);
+ }
}
return ret;
int
OSC::cue_set (uint32_t aux, lo_message msg)
{
+
return _cue_set (aux, get_address (msg));
}
OSC::_cue_set (uint32_t aux, lo_address addr)
{
int ret = 1;
- OSCSurface *s = get_surface(addr);
+ OSCSurface *s = get_surface(addr, true);
s->bank_size = 0;
s->strip_types = 128;
s->feedback = 0;
s->gainmode = 1;
s->cue = true;
- s->strips = get_sorted_stripables(s->strip_types, s->cue);
+ s->strips = get_sorted_stripables(s->strip_types, s->cue, false, s->custom_strips);
s->nstrips = s->strips.size();
aux = s->nstrips;
}
s->aux = aux;
-
- // get rid of any old CueObsevers for this address
- //cueobserver_connections.drop_connections ();
- CueObservers::iterator x;
- for (x = cue_observers.begin(); x != cue_observers.end();) {
-
- OSCCueObserver* co;
-
- if ((co = dynamic_cast<OSCCueObserver*>(*x)) != 0) {
-
- int res = strcmp(lo_address_get_url(co->address()), lo_address_get_url(addr));
-
- if (res == 0) {
- delete *x;
- x = cue_observers.erase (x);
- } else {
- ++x;
- }
- } else {
- ++x;
- }
- }
-
// get a list of Auxes
for (uint32_t n = 0; n < s->nstrips; ++n) {
boost::shared_ptr<Stripable> stp = s->strips[n];
text_message (string_compose ("/cue/name/%1", n+1), stp->name(), addr);
if (aux == n+1) {
// aux must be at least one
- // need a signal if aux vanishes
- stp->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::_cue_set, this, aux, addr), this);
+ stp->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::_cue_set, this, aux, addr), this);
// make a list of stripables with sends that go to this bus
s->sends = cue_get_sorted_stripables(stp, aux, addr);
- // start cue observer
- OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr);
- cue_observers.push_back (co);
+ if (s->cue_obs) {
+ s->cue_obs->refresh_strip (stp, s->sends, true);
+ } else {
+ // start cue observer
+ OSCCueObserver* co = new OSCCueObserver (*this, s);
+ s->cue_obs = co;
+ }
ret = 0;
}
int
OSC::cue_next (lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ OSCSurface *s = get_surface(get_address (msg), true);
int ret = 1;
if (!s->cue) {
int
OSC::cue_previous (lo_message msg)
{
- OSCSurface *s = get_surface(get_address (msg));
+ OSCSurface *s = get_surface(get_address (msg), true);
int ret = 1;
if (!s->cue) {
ret = cue_set (1, msg);
}
if (s->aux > 1) {
ret = cue_set (s->aux - 1, msg);
+ } else {
+ ret = cue_set (1, msg);
}
return ret;
}
boost::shared_ptr<Send>
OSC::cue_get_send (uint32_t id, lo_address addr)
{
- OSCSurface *s = get_surface(addr);
+ OSCSurface *s = get_surface(addr, true);
if (id && s->aux > 0 && id <= s->sends.size()) {
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s->sends[id - 1]);
boost::shared_ptr<Stripable> aux = get_strip (s->aux, addr);
{
if (!session) return -1;
- OSCSurface *sur = get_surface(get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg), true);
if (sur->cue) {
if (sur->aux) {
boost::shared_ptr<Stripable> s = get_strip (sur->aux, get_address (msg));
}
}
}
- cue_float_message ("/cue/fader", 0, get_address (msg));
+ float_message ("/cue/fader", 0, get_address (msg));
return -1;
}
{
if (!session) return -1;
- OSCSurface *sur = get_surface(get_address (msg));
+ OSCSurface *sur = get_surface(get_address (msg), true);
if (sur->cue) {
if (sur->aux) {
boost::shared_ptr<Stripable> s = get_strip (sur->aux, get_address (msg));
}
}
}
- cue_float_message ("/cue/mute", 0, get_address (msg));
+ float_message ("/cue/mute", 0, get_address (msg));
return -1;
}
return 0;
}
}
- cue_float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg));
+ float_message (string_compose ("/cue/send/fader/%1", id), 0, get_address (msg));
return -1;
}
}
return 0;
}
- cue_float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg));
+ float_message (string_compose ("/cue/send/enable/%1", id), 0, get_address (msg));
return -1;
}
+// generic send message
int
-OSC::cue_float_message (string path, float val, lo_address addr)
+OSC::float_message (string path, float val, lo_address addr)
{
lo_message reply;
return 0;
}
+int
+OSC::float_message_with_id (std::string path, uint32_t ssid, float value, bool in_line, lo_address addr)
+{
+ lo_message msg = lo_message_new ();
+ if (in_line) {
+ path = string_compose ("%1/%2", path, ssid);
+ } else {
+ lo_message_add_int32 (msg, ssid);
+ }
+ lo_message_add_float (msg, value);
+
+ lo_send_message (addr, path.c_str(), msg);
+ lo_message_free (msg);
+ return 0;
+}
+
+int
+OSC::int_message_with_id (std::string path, uint32_t ssid, int value, bool in_line, lo_address addr)
+{
+ lo_message msg = lo_message_new ();
+ if (in_line) {
+ path = string_compose ("%1/%2", path, ssid);
+ } else {
+ lo_message_add_int32 (msg, ssid);
+ }
+ lo_message_add_int32 (msg, value);
+
+ lo_send_message (addr, path.c_str(), msg);
+ lo_message_free (msg);
+ return 0;
+}
+
int
OSC::text_message (string path, string val, lo_address addr)
{
return 0;
}
+int
+OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, bool in_line, lo_address addr)
+{
+ lo_message msg = lo_message_new ();
+ if (in_line) {
+ path = string_compose ("%1/%2", path, ssid);
+ } else {
+ lo_message_add_int32 (msg, ssid);
+ }
+
+ lo_message_add_string (msg, val.c_str());
+
+ lo_send_message (addr, path.c_str(), msg);
+ lo_message_free (msg);
+ return 0;
+}
// we have to have a sorted list of stripables that have sends pointed at our aux
// we can use the one in osc.cc to get an aux list
OSC::cue_get_sorted_stripables(boost::shared_ptr<Stripable> aux, uint32_t id, lo_message msg)
{
Sorted sorted;
- cueobserver_connections.drop_connections ();
// fetch all stripables
StripableList stripables;
projects / ardour.git / blobdiff