, default_plugin_size (0)
, tick (true)
, bank_dirty (false)
+ , observer_busy (true)
, scrub_speed (0)
, gui (0)
{
OSC::~OSC()
{
tick = false;
- std::cout << "OSC term before stop\n";
stop ();
- std::cout << "OSC term after stop\n";
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
- for (uint32_t it = 0; it < _surface.size(); ++it) {
+ observer_busy = true;
+ for (uint32_t it = 0; it < _surface.size (); ++it) {
OSCSurface* sur = &_surface[it];
surface_destroy (sur);
}
_surface.clear();
- std::cout << "sur cleared.\n";
-
- periodic_connection.disconnect ();
- session_connections.drop_connections ();
- cueobserver_connections.drop_connections ();
+ /* stop main loop */
if (local_server) {
g_source_destroy (local_server);
g_source_unref (local_server);
void
OSC::surface_destroy (OSCSurface* sur)
{
- if (sur->sel_obs) {
- sur->sel_obs->clear_observer ();
- delete sur->sel_obs;
+ 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 ();
}
- if (sur->cue_obs) {
- // sur->cue_obs->clear_observer ();
- delete sur->cue_obs;
+
+ OSCCueObserver* co;
+ if ((co = dynamic_cast<OSCCueObserver*>(sur->cue_obs)) != 0) {
+ co->clear_observer ();
+ delete co;
sur->cue_obs = 0;
}
- if (sur->global_obs) {
- sur->global_obs->clear_observer ();
- delete sur->global_obs;
+
+ OSCGlobalObserver* go;
+ if ((go = dynamic_cast<OSCGlobalObserver*>(sur->global_obs)) != 0) {
+ go->clear_observer ();
+ delete go;
sur->global_obs = 0;
}
- for (uint32_t i = 0; i < sur->observers.size(); i++) {
- sur->observers[i]->clear_strip ();
- delete sur->observers[i];
- }
+ uint32_t st_end = sur->observers.size ();
+ 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;
+ }
+ }
sur->observers.clear();
}
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, "/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, "/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);
/* 15 for /#current_value plus 2 for /<path> */
len = strlen (path);
+ /*
+ * not needed until /strip/listen/ignore fixed
OSCSurface *sur = get_surface(get_address (msg));
+ */
if (strstr (path, "/automation")) {
ret = set_automation (path, 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 (!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) {
if (s->rec_enable_control()) {
lo_message_add_int32 (reply, s->rec_enable_control()->get_value());
}
-
- /*
- * get_surface above already does this if feedback is turned on
- * //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_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)
+{
+ /* 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.
+ */
+
+ cerr << "List of known Surfaces: " << _surface.size() << "\n\n";
+
+ Glib::Threads::Mutex::Lock lm (surfaces_lock);
+ for (uint32_t it = 0; it < _surface.size(); it++) {
+ OSCSurface* sur = &_surface[it];
+ cerr << string_compose (" Surface: %1 URL: %2\n", it, sur->remote_url);
+ cerr << string_compose (" Number of strips: %1 Bank size: %2 Current Bank %3\n", sur->nstrips, sur->bank_size, sur->bank);
+ bool ug = false;
+ if (sur->usegroup == PBD::Controllable::UseGroup) {
+ ug = true;
+ }
+ cerr << string_compose (" Strip Types: %1 Feedback: %2 no_clear: %3 gain mode: %4 use groups? %5\n", \
+ sur->strip_types.to_ulong(), sur->feedback.to_ulong(), sur->no_clear, sur->gainmode, ug);
+ cerr << 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);
+ cerr << string_compose (" send page size: %1 page: %2\n", sur->send_page_size, sur->send_page);
+ cerr << string_compose (" expanded? %1 track: %2 jogmode: %3\n", sur->expand_enable, sur->expand, sur->jogmode);
+ cerr << string_compose (" personal monitor? %1, Aux master: %2, number of sends: %3\n", sur->cue, sur->aux, sur->sends.size());
+ cerr << string_compose (" Linkset: %1 Device Id: %2\n", sur->linkset, sur->linkid);
+ }
+ cerr << "\nList of LinkSets " << link_sets.size() << "\n\n";
+ 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->linked.size()) {
+ devices = set->linked.size() - 1;
+ }
+ cerr << string_compose (" Linkset %1 has %2 devices and sees %3 strips\n", (*it).first, devices, set->strips.size());
+ cerr << string_compose (" Bank size: %1 Current bank: %2 Strip Types: %3\n", set->banksize, set->bank, set->strip_types.to_ulong());
+ cerr << string_compose (" auto bank sizing: %1 linkset not ready: %2\n", set->autobank, set->not_ready);
+ }
+ cerr << "\n";
}
int
int
OSC::refresh_surface (lo_message msg)
{
- 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;
}
OSC::clear_devices ()
{
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);
+
+ observer_busy = false;
tick = true;
}
int
-OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc, lo_message msg)
+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 {
+ set = argv[0]->i;
+ }
+ } else {
+ PBD::warning << "OSC: wrong number of parameters." << endmsg;
+ return ret;
+ }
OSCSurface *sur = get_surface(get_address (msg));
+ 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;
+ link_sets[set] = new_ls;
+ }
+ ls = &link_sets[set];
+
+ } else {
+ // User expects this surface to be removed from any sets
+ int oldset = sur->linkset;
+ if (oldset) {
+ int oldid = sur->linkid;
+ sur->linkid = 1;
+ sur->linkset = 0;
+ ls = &link_sets[oldid];
+ if (ls) {
+ ls->not_ready = 1;
+ ls->linked[(uint32_t) data] = 0;
+ }
+ }
+ 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;
+ strip_feedback (sur, true);
+ } else {
+ _set_bank (ls->bank, get_address (msg));
+ }
+ ret = 0;
+
+ } else if (!strncmp (path, "/link/set", 9)) {
+ sur->linkset = set;
+ sur->linkid = (uint32_t) data;
+ if (ls->linked.size() <= (uint32_t) data) {
+ ls->linked.resize((int) data + 1);
+ }
+ ls->linked[(uint32_t) data] = sur;
+ ls->not_ready = link_check (set);
+ if (ls->not_ready) {
+ strip_feedback (sur, true);
+ } else {
+ _set_bank (1, get_address (msg));
+ }
+ ret = 0;
+ }
+
+ return ret;
+}
+
+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;
+ uint32_t set_ready = 0;
+ for (uint32_t dv = 1; dv < ls->linked.size(); dv++) {
+ if ((ls->linked[dv]) && ((ls->linked[dv]))->linkset == set) {
+ OSCSurface *su = (ls->linked[dv]);
+ bank_total = bank_total + su->bank_size;
+ } else if (!set_ready) {
+ set_ready = dv;
+ }
+ }
+ if (ls->autobank) {
+ ls->banksize = bank_total;
+ } else {
+ if (!set_ready && bank_total != ls->banksize) {
+ set_ready = ls->linked.size();
+ }
+ }
+ return set_ready;
+}
+
+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), true);
int pi_page = sur->plug_page_size;
int se_page = sur->send_page_size;
int fadermode = sur->gainmode;
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;
s->strip_types = strips;
s->feedback = fb;
s->send_page_size = se_size;
s->plug_page_size = pi_size;
// set bank and strip feedback
- strip_feedback(s);
+ // XXXX check if we are already in a linkset
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), get_address (msg), true);
+ strip_feedback(s, true);
- global_feedback (s, get_address (msg));
+ 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;
+ // XXXX check if we are already in a linkset
s->bank = 1;
// set bank and strip feedback
- strip_feedback (s);
+ strip_feedback (s, true);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), 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;
}
// set bank and strip feedback
+ // XXXX check for linkset
s->bank = 1;
- strip_feedback (s);
+ strip_feedback (s, true);
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), 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 strip feedback
- strip_feedback (s);
-
- // Set global/master feedback
- global_feedback (s, get_address (msg));
+ strip_feedback (s, false);
+ 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 strip feedback
- strip_feedback (s);
-
- // Set global/master feedback
- global_feedback (s, get_address (msg));
+ strip_feedback (s, false);
+ 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;
free (rurl);
{
for (uint32_t it = 0; it < _surface.size(); ++it) {
- //find setup for this server
+ //find setup for this surface
if (!_surface[it].remote_url.find(r_url)){
return &_surface[it];
}
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);
}
- std::cout << "surface saved, do gui_selection\n";
- // 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();
- }
- std::cout << "after gui_selection, call strip_feedback\n";
- // set bank and strip feedback
- strip_feedback (&s);
- std::cout << "after strip_feedback, call global_feedback\n";
-
- // Set global/master feedback
- global_feedback (&s, addr);
- usleep ((uint32_t) 20000);
-
- std::cout << "after global_feedback\n";
+ 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 (OSCSurface* sur, lo_address addr)
+OSC::global_feedback (OSCSurface* sur)
{
- std::bitset<32> feedback = sur->feedback;
- if (feedback[4] || feedback[3] || feedback[5] || feedback[6]) {
+ 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);
}
void
-OSC::strip_feedback (OSCSurface* sur)
+OSC::strip_feedback (OSCSurface* sur, bool new_bank_size)
{
- std::cout << "strip_feedback, begin\n";
- // delete old observers
- for (uint32_t i = 0; i < sur->observers.size(); i++) {
- sur->observers[i]->clear_strip ();
- delete sur->observers[i];
- }
- sur->observers.clear();
- std::cout << string_compose ("observers delected: size: %1\n", sur->observers.size());
-
- // get freash striplist - just in case
sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
sur->nstrips = sur->strips.size();
- uint32_t bank_size = sur->bank_size;
- if (!bank_size) {
- bank_size = sur->nstrips;
- }
+ 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();
+
+ uint32_t bank_size = sur->bank_size;
+ if (!bank_size) {
+ bank_size = sur->nstrips;
+ }
- 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);
+ 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++) {
+ sur->observers[i]->refresh_strip(true);
+ }
}
}
- std::cout << string_compose ("observers created: size: %1\n", sur->observers.size());
+ bank_leds (sur);
}
void
void
OSC::_recalcbanks ()
{
- if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
- _select = ControlProtocol::first_selected_stripable();
- gui_selection_changed ();
+ if (observer_busy) {
+ return;
}
+ /*
+ * 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];
+ sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
+ sur->nstrips = sur->strips.size();
// find lo_address
lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr, true);
if (sur->cue) {
_cue_set (sur->aux, addr);
- } else {
- for (uint32_t i = 0; i < sur->observers.size(); i++) {
- sur->observers[i]->refresh_strip (false);
- }
- }
-
- if (!sur->bank_size) {
+ } 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);
}
}
}
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;
- s->strips = get_sorted_stripables(s->strip_types, s->cue);
- s->nstrips = s->strips.size();
+ LinkSet *set;
+ uint32_t l_set = s->linkset;
+ if (l_set) {
+ //we have a linkset... deal with each surface
+ set = &(link_sets[l_set]);
+ if (set->not_ready) {
+ return 1;
+ }
+ uint32_t s_count = set->linked.size();
+ set->strips = striplist;
+ bank_start = bank_limits_check (bank_start, set->banksize, nstrips);
+ set->bank = bank_start;
+ for (uint32_t ls = 1; ls < s_count; ls++) {
+ OSCSurface *sur = (set->linked[ls]);
+ if (!sur || sur->linkset != l_set) {
+ if (!set->not_ready) {
+ set->not_ready = ls;
+ }
+ set->bank = 1;
+ return 1;
+ }
+ lo_address sur_addr = lo_address_new_from_url (sur->remote_url.c_str());
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr, true);
+
+ sur->bank = bank_start;
+ bank_start = bank_start + sur->bank_size;
+ strip_feedback (sur, false);
+ bank_leds (sur);
+ lo_address_free (sur_addr);
+ }
+ } else {
+
+ _strip_select (boost::shared_ptr<ARDOUR::Stripable>(), addr, true);
+ s->bank = bank_limits_check (bank_start, s->bank_size, nstrips);
+ strip_feedback (s, true);
+ bank_leds (s);
+ }
+
+
+ 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]) {
+ return bank;
+}
- for (uint32_t i = 0; i < s->observers.size(); i++) {
- s->observers[i]->refresh_strip (false);
+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)
{
- if (!session) {
- return -1;
- }
- OSCSurface *s = get_surface(get_address (msg));
- if (s->bank < s->bank_size) {
- set_bank (1, msg);
- } else {
- set_bank (s->bank - s->bank_size, msg);
- }
- return 0;
+ return bank_delta (-1.0, msg);
}
int
}
+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)
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);
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 (sur->expand_enable && sur->expand) {
strp = get_strip (sur->expand, get_address (msg));
} else {
- strp = ControlProtocol::first_selected_stripable();
+ strp = _select;
}
ctr = 8;
} else {
}
}
- return float_message_with_id ("/strip/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
}
}
- return float_message_with_id ("/strip/solo", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/solo", ssid, 0, sur->feedback[2], get_address (msg));
}
int
}
}
- return float_message_with_id ("/strip/solo_iso", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/solo_iso", ssid, 0, sur->feedback[2], get_address (msg));
}
int
}
}
- return float_message_with_id ("/strip/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
}
}
}
- return float_message_with_id ("/strip/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
}
}
}
- return float_message_with_id ("/strip/record_safe", ssid, 0,get_address (msg));
+ return float_message_with_id ("/strip/record_safe", 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, sur->usegroup);
+ 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 float_message_with_id ("/strip/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
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, sur->usegroup);
+ 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 float_message_with_id ("/strip/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));
}
}
}
- return float_message_with_id ("/strip/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_select (boost::shared_ptr<Stripable> s, lo_address addr)
+OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr, bool quiet)
{
if (!session) {
return -1;
}
- OSCSurface *sur = get_surface(addr);
- if (sur->sel_obs) {
- delete sur->sel_obs;
- sur->sel_obs = 0;
+ OSCSurface *sur = get_surface(addr, true);
+ if (!s) {
+ if (sur->expand_enable) {
+ // expand doesn't point to a stripable, turn it off and use select
+ sur->expand = 0;
+ sur->expand_enable = false;
+ }
+ if(ControlProtocol::first_selected_stripable()) {
+ s = ControlProtocol::first_selected_stripable();
+ } else {
+ s = session->master_out ();
+ }
+ _select = s;
}
- bool feedback_on = sur->feedback[13];
- if (s && feedback_on) {
- sur->select = s;
+ sur->select = s;
+ 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) {
+ delete so;
+ }
OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, sur);
- s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
sur->sel_obs = sel_fb;
- } else if (sur->expand_enable) {
- // expand doesn't point to a stripable, turn it off and use select
- sur->expand = 0;
- sur->expand_enable = false;
- if (_select && feedback_on) {
- s = _select;
- sur->select = s;
- OSCSelectObserver* sel_fb = new OSCSelectObserver (*this, sur);
- s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
- sur->sel_obs = sel_fb;
- }
- } else if (feedback_on) {
- float_message_with_id ("/strip/select", sur->expand, 0 , addr);
- }
- // need to set monitor for processor changed signal
+ } else {
+ if (so != 0) {
+ delete so;
+ sur->sel_obs = 0;
+ }
+ }
+
+ // need to set monitor for processor changed signal (for paging)
// detecting processor changes requires cast to route
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(s);
if (r) {
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;
- }
- 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);
-
- 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);
-
- } 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);
- }
- }
- 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);
+ if (!quiet) {
+ strip_feedback (sur, false);
}
return 0;
SetStripableSelection (s);
} else {
if ((int) (sur->feedback.to_ulong())) {
- float_message_with_id ("/strip/select", ssid, 0, get_address (msg));
+ float_message_with_id ("/strip/select", ssid, 0, sur->feedback[2], get_address (msg));
}
}
if (state && sur->expand) {
s = get_strip (sur->expand, get_address (msg));
} else {
- s = ControlProtocol::first_selected_stripable();
+ s = _select;
}
return _strip_select (s, get_address (msg));
if (!session) {
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 float_message_with_id ("/strip/gain", ssid, -193, get_address (msg));
+ return float_message_with_id ("/strip/gain", ssid, -193, sur->feedback[2], get_address (msg));
}
return 0;
}
return 0;
}
}
- return sel_fail ("gain", -193, get_address (msg));
+ return float_message("/select/gain", -193, get_address (msg));
}
int
return 0;
}
}
- return sel_fail ("gain", -193, get_address (msg));
+ return float_message("/select/gain", -193, get_address (msg));
}
int
fake_touch (s->gain_control());
s->gain_control()->set_value (s->gain_control()->interface_to_internal (pos), sur->usegroup);
} else {
- return float_message_with_id ("/strip/fader", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg));
}
} else {
- return float_message_with_id ("/strip/fader", ssid, 0, get_address (msg));
+ return float_message_with_id ("/strip/fader", ssid, 0, sur->feedback[2], get_address (msg));
}
return 0;
}
return 0;
}
}
- return sel_fail ("fader", 0, get_address (msg));
+ return float_message("/select/fader", 0, get_address (msg));
}
int
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 float_message_with_id ("/strip/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
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
}
}
- return float_message_with_id ("/strip/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
}
}
- return float_message_with_id ("/strip/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
{
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) {
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) {
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
{
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) {
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
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
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));
+ return float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg));
}
boost::shared_ptr<Stripable> s;
if (sur->expand_enable) {
int parid = paid + (int)(sur->plug_page_size * (sur->plug_page - 1));
if (parid > (int) sur->plug_params.size ()) {
if (sur->feedback[13]) {
- sel_send_fail ("plugin/parameter", paid, 0, get_address (msg));
+ float_message_with_id ("/select/plugin/parameter", paid, 0, sur->feedback[2], get_address (msg));
}
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)
{
- // XXXX tick turned off for testing
- // return true; // no crash with this enabled :P
+ 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, addr);
+ global_feedback (sur);
}
global_init = false;
tick = true;
bank_dirty = false;
tick = true;
}
+ return true;
}
- //return true;
if (scrub_speed != 0) {
// for those jog wheels that don't have 0 on release (touch), time out.
go->tick ();
}
for (uint32_t i = 0; i < sur->observers.size(); i++) {
- sur->observers[i]->tick ();
+ OSCRouteObserver* ro;
+ if ((ro = dynamic_cast<OSCRouteObserver*>(sur->observers[i])) != 0) {
+ ro->tick ();
+ }
}
}
return true;
}
-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 ()
{
int
OSC::cue_set (uint32_t aux, lo_message msg)
{
+ set_surface_feedback (0, msg);
return _cue_set (aux, get_address (msg));
}
}
s->aux = aux;
- //cueobserver_connections.drop_connections ();
-
// get a list of Auxes
for (uint32_t n = 0; n < s->nstrips; ++n) {
boost::shared_ptr<Stripable> stp = s->strips[n];
// 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);
- s->cue_obs = co;
+ if (s->cue_obs) {
+ s->cue_obs->refresh_strip (false);
+ } else {
+ // start cue observer
+ OSCCueObserver* co = new OSCCueObserver (*this, s);
+ s->cue_obs = co;
+ }
ret = 0;
}
}
int
-OSC::float_message_with_id (std::string path, uint32_t ssid, float value, lo_address addr)
+OSC::float_message_with_id (std::string path, uint32_t ssid, float value, bool in_line, lo_address addr)
{
- OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
- if (sur->feedback[2]) {
+ if (in_line) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);
}
int
-OSC::int_message_with_id (std::string path, uint32_t ssid, int value, lo_address addr)
+OSC::int_message_with_id (std::string path, uint32_t ssid, int value, bool in_line, lo_address addr)
{
- OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
- if (sur->feedback[2]) {
+ if (in_line) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);
}
int
-OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, lo_address addr)
+OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, bool in_line, lo_address addr)
{
- OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
- if (sur->feedback[2]) {
+ if (in_line) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);
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