Fix parameter evaluation

Author: CrSjimo

src/plugins/synth/internal/scheduler/SynthesisDocumentWriter.cpp

@@ -17,10 +17,8 @@
 #include <dspxmodelORM/Phoneme.h>
 #include <dspxmodelORM/PhonemeSequence.h>
 #include <dspxmodelORM/SingingClip.h>
-#include <dspxmodelORM/Sources.h>
 #include <synth/SynthesisPiece.h>
 #include <synth/internal/SynthesisProjectInput.h>
-#include <synth/internal/private/ParameterExpressionUtils_p.h>
 
 namespace Synth::Internal::DocumentWriter {
 
@@ -54,20 +52,12 @@ namespace Synth::Internal::DocumentWriter {
             if (!modelParameter || it->values.isEmpty() || it->sampleRate <= 0.0) {
                 continue;
             }
-            const auto configuration = ProjectInput::parameterConfiguration(clip->sources()->category(), it.key());
             QList<QVariant> values;
             for (int index = firstIndex; index < lastIndex; ++index) {
                 const int tick = index * dspx::FreeValueDataArray::step();
                 const double offset = ProjectInput::tickSeconds(timeline, clip->start() + tick) - pieceStartSeconds;
                 const int sample = std::clamp(static_cast<int>(std::round(offset * it->sampleRate)), 0, static_cast<int>(it->values.size()) - 1);
-                double value = it->values.at(sample);
-                if (!configuration.id().isEmpty()) {
-                    double denormalized{};
-                    if (ParameterExpressionUtils::evaluate(configuration.denormalizationExpression(), value, &denormalized)) {
-                        value = denormalized;
-                    }
-                }
-                values.append(static_cast<int>(std::round(value)));
+                values.append(static_cast<int>(std::round(it->values.at(sample))));
             }
             auto original = modelParameter->original();
             if (original->size() < firstIndex) {

src/plugins/synth/internal/scheduler/SynthesisParameterEvaluator.cpp

@@ -15,7 +15,6 @@
 #include <dspxmodelORM/FreeValueDataArray.h>
 #include <dspxmodelORM/Parameter.h>
 #include <opendspxinterpolator/parameterinterpolator.h>
-#include <synth/internal/private/ParameterExpressionUtils_p.h>
 
 namespace Synth::Internal {
 
@@ -178,13 +177,4 @@ namespace Synth::Internal {
         return *base * (transform ? *transform / 1000.0 : 1.0);
     }
 
-    double SynthesisParameterEvaluator::normalize(const ParameterConfiguration &configuration, double value) {
-        double normalized = value;
-        if (!configuration.id().isEmpty() &&
-            !ParameterExpressionUtils::evaluate(configuration.normalizationExpression(), value, &normalized)) {
-            normalized = value;
-        }
-        return normalized;
-    }
-
 }

src/plugins/synth/internal/scheduler/SynthesisParameterEvaluator.h

@@ -3,8 +3,6 @@
 
 #include <memory>
 
-#include <synth/ParameterConfiguration.h>
-
 namespace dspx {
     class Parameter;
 }
@@ -17,7 +15,6 @@ namespace Synth::Internal {
         ~SynthesisParameterEvaluator();
 
         double evaluate(double tick, double fallback) const;
-        static double normalize(const ParameterConfiguration &configuration, double value);
 
     private:
         struct Data;