Browse Source

LV2 Client: Use non-normalised values for enumeration scalePoints

v7.0.9
reuk 2 years ago
parent
commit
3451d97277
No known key found for this signature in database GPG Key ID: FCB43929F012EE5C
1 changed files with 19 additions and 17 deletions
  1. +19
    -17
      modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp

+ 19
- 17
modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp View File

@@ -1055,18 +1055,21 @@ private:
os << "\trdfs:range atom:Float ;\n"; os << "\trdfs:range atom:Float ;\n";
if (auto* rangedParam = dynamic_cast<const RangedAudioParameter*> (&param))
const auto [defaultValue, min, max] = [&]
{ {
os << "\tlv2:default " << rangedParam->convertFrom0to1 (rangedParam->getDefaultValue()) << " ;\n"
"\tlv2:minimum " << rangedParam->getNormalisableRange().start << " ;\n"
"\tlv2:maximum " << rangedParam->getNormalisableRange().end;
}
else
{
os << "\tlv2:default " << param.getDefaultValue() << " ;\n"
"\tlv2:minimum 0.0 ;\n"
"\tlv2:maximum 1.0";
}
if (auto* rangedParam = dynamic_cast<const RangedAudioParameter*> (&param))
{
return std::tuple (rangedParam->convertFrom0to1 (rangedParam->getDefaultValue()),
rangedParam->getNormalisableRange().start,
rangedParam->getNormalisableRange().end);
}
return std::tuple (param.getDefaultValue(), 0.0f, 1.0f);
}();
os << "\tlv2:default " << defaultValue << " ;\n"
"\tlv2:minimum " << min << " ;\n"
"\tlv2:maximum " << max;
// Avoid writing out loads of scale points for parameters with lots of steps // Avoid writing out loads of scale points for parameters with lots of steps
constexpr auto stepLimit = 1000; constexpr auto stepLimit = 1000;
@@ -1078,15 +1081,14 @@ private:
"\tlv2:portProperty lv2:enumeration " << (param.isBoolean() ? ", lv2:toggled " : "") << ";\n" "\tlv2:portProperty lv2:enumeration " << (param.isBoolean() ? ", lv2:toggled " : "") << ";\n"
"\tlv2:scalePoint "; "\tlv2:scalePoint ";
const auto maxIndex = numSteps - 1;
auto counter = 0;
for (int i = 0; i < numSteps; ++i)
for (const auto& string : param.getAllValueStrings())
{ {
const auto value = (float) i / (float) maxIndex;
const auto text = param.getText (value, 1024);
const auto value = jmap ((float) counter++, 0.0f, (float) numSteps - 1.0f, min, max);
os << (i != 0 ? ", " : "") << "[\n"
"\t\trdfs:label \"" << text << "\" ;\n"
os << (counter != 0 ? ", " : "") << "[\n"
"\t\trdfs:label \"" << string << "\" ;\n"
"\t\trdf:value " << value << " ;\n" "\t\trdf:value " << value << " ;\n"
"\t]"; "\t]";
} }


Loading…
Cancel
Save