ardour/livetrax
13
0
Fork 0
Code

Fix and tweak LV2:RangeStep

Browse Source 
Explicit cast to float (rangestep is unsigned int) when calculating
interface steps.
Also prefer to round to nearest value-point (rather than round-down).
This commit is contained in:
Robin Gareus 2018-07-18 10:48:03 +02:00
parent fa17364977
commit 14517e13ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/parameter_descriptor.cc
View File

@ -207,9 +207,9 @@ ParameterDescriptor::update_steps()
largestep = (powf (delta, std::max (0.5f, 10.f / (float)rangesteps)) - 1.f) * lower; largestep = (powf (delta, std::max (0.5f, 10.f / (float)rangesteps)) - 1.f) * lower;
} else if (integer_step) { } else if (integer_step) {
smallstep = step = 1.0; smallstep = step = 1.0;
largestep = std::max(1.f, rintf (delta / (rangesteps - 1))); largestep = std::max(1.f, rintf (delta / (rangesteps - 1.f)));
} else { } else {
step = smallstep = delta / (rangesteps - 1); step = smallstep = delta / (rangesteps - 1.f);
largestep = std::min ((delta / 4.0f), 10.f * smallstep); // XXX largestep = std::min ((delta / 4.0f), 10.f * smallstep); // XXX
} }
} else { } else {
@ -387,7 +387,7 @@ ParameterDescriptor::from_interface (float val) const
val = floor (lower + val * (1.f + upper - lower)); val = floor (lower + val * (1.f + upper - lower));
} else if (rangesteps > 1) { } else if (rangesteps > 1) {
/* similar to above, but for float controls */ /* similar to above, but for float controls */
val = floor (val * (rangesteps - 1.f)) / (rangesteps - 1.f); // XXX val = round (val * (rangesteps - 1.f)) / (rangesteps - 1.f); // XXX
val = val * (upper - lower) + lower; val = val * (upper - lower) + lower;
} else { } else {
val = val * (upper - lower) + lower; val = val * (upper - lower) + lower;