smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

OSC: fix compiler warning and catch possible errors

Browse source
This commit is contained in:
Len Ovens 2018-02-21 19:24:18 -08:00
parent c746e78b3b
commit d79bcd44b2
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs/surfaces/osc/osc.cc
View file

@ -2349,17 +2349,25 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr)
set->bank = bank_start; set->bank = bank_start;
uint32_t not_ready = 0; uint32_t not_ready = 0;
for (uint32_t dv = 1; dv < d_count; dv++) { for (uint32_t dv = 1; dv < d_count; dv++) {
OSCSurface *sur;
if (set->urls[dv] != "") { if (set->urls[dv] != "") {
string url = set->urls[dv]; string url = set->urls[dv];
sur = get_surface (lo_address_new_from_url (url.c_str())); OSCSurface *sur = get_surface (lo_address_new_from_url (url.c_str()));
if (sur->linkset != ls) {
set->urls[dv] = "";
not_ready = dv;
} else {
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);
}
} else { } else {
not_ready = dv; not_ready = dv;
} }
if (sur->linkset != ls) {
set->urls[dv] = "";
not_ready = dv;
}
if (not_ready) { if (not_ready) {
if (!set->not_ready) { if (!set->not_ready) {
set->not_ready = not_ready; set->not_ready = not_ready;
@ -2367,14 +2375,6 @@ OSC::_set_bank (uint32_t bank_start, lo_address addr)
set->bank = 1; set->bank = 1;
break; 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) { if (not_ready) {
surface_link_state (set); surface_link_state (set);