ardour/livetrax
13
0
Fork 0
Code

OSC link: make whole link set follow strip_types

Browse Source 
strip should not run periodic when blank - crash fix
This commit is contained in:
Len Ovens 2017-11-10 08:38:08 -08:00
parent 634c620b07
commit 69603bb76e
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/surfaces/osc/osc.cc
View File

@ -1469,6 +1469,42 @@ OSC::set_link (uint32_t set, uint32_t id, lo_address 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] = "";
}
}
}
}
void
OSC::surface_link_state (LinkSet * set)
{
@ -1763,6 +1799,7 @@ OSC::set_surface (uint32_t b_size, uint32_t strips, uint32_t fb, uint32_t gm, ui
s->plug_page_size = pi_size;
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);
@ -1805,6 +1842,9 @@ OSC::set_surface_strip_types (uint32_t st, lo_message msg)
} else {
s->usegroup = PBD::Controllable::NoGroup;
}
if (s->linkset) {
link_strip_types (s->linkset, st);
}
// set bank and strip feedback
_set_bank (1, get_address (msg));

1
libs/surfaces/osc/osc.h
View File

@ -322,6 +322,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
int link_check (uint32_t linkset);
int set_link (uint32_t set, uint32_t id, lo_address addr);
void surface_link_state (LinkSet * set);
void link_strip_types (uint32_t linkset, uint32_t striptypes);
#define OSC_DEBUG \
if (_debugmode == All) { \

1
libs/surfaces/osc/osc_route_observer.cc
View File

@ -120,7 +120,6 @@ OSCRouteObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip,
if (!_strip) {
// this strip is blank and should be cleared
clear_strip ();
_init = false;
return;
}
_strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::no_strip, this), OSC::instance());