ardour/livetrax
13
0
Fork 0
Code

OSC: fix c++98 mistake

Browse Source
This commit is contained in:
Len Ovens 2017-05-20 09:09:01 -07:00
parent 9fc65b274e
commit ab069b1372
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2343,11 +2343,10 @@ OSC::touch_detect (const char *path, lo_arg **argv, int argc, lo_message msg)
control->stop_touch (true, control->session().transport_frame());
}
// just in case some crazy surface starts sending control values before touch
for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end();) {
for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end(); x++) {
if ((*x).first == control) {
x = _touch_timeout.erase (x);
} else {
++x;
_touch_timeout.erase (x);
break;
}
}
}
@ -3976,15 +3975,14 @@ OSC::periodic (void)
co->tick();
}
}
for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end();) {
for (FakeTouchMap::iterator x = _touch_timeout.begin(); x != _touch_timeout.end(); x++) {
_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());
x = _touch_timeout.erase (x);
} else {
++x;
_touch_timeout.erase (x);
break;
}
}
return true;