OSC: fix c++98 mistake
This commit is contained in:
parent
9fc65b274e
commit
ab069b1372
@ -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());
|
control->stop_touch (true, control->session().transport_frame());
|
||||||
}
|
}
|
||||||
// just in case some crazy surface starts sending control values before touch
|
// 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) {
|
if ((*x).first == control) {
|
||||||
x = _touch_timeout.erase (x);
|
_touch_timeout.erase (x);
|
||||||
} else {
|
break;
|
||||||
++x;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -3976,15 +3975,14 @@ OSC::periodic (void)
|
|||||||
co->tick();
|
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;
|
_touch_timeout[(*x).first] = (*x).second - 1;
|
||||||
if (!(*x).second) {
|
if (!(*x).second) {
|
||||||
boost::shared_ptr<ARDOUR::AutomationControl> ctrl = (*x).first;
|
boost::shared_ptr<ARDOUR::AutomationControl> ctrl = (*x).first;
|
||||||
// turn touch off
|
// turn touch off
|
||||||
ctrl->stop_touch (true, ctrl->session().transport_frame());
|
ctrl->stop_touch (true, ctrl->session().transport_frame());
|
||||||
x = _touch_timeout.erase (x);
|
_touch_timeout.erase (x);
|
||||||
} else {
|
break;
|
||||||
++x;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user