From 5e1b06d810140e47eba652cbe02b778a0f340e36 Mon Sep 17 00:00:00 2001
From: Paul Fd <paul@ferrand.cc>
Date: Sat, 10 Jul 2021 20:58:04 +0200
Subject: [PATCH] Don't normalize pitch and filter

---
 src/sfizz/Defaults.cpp       | 4 ++--
 src/sfizz/Region.cpp         | 2 +-
 src/sfizz/SynthMessaging.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sfizz/Defaults.cpp b/src/sfizz/Defaults.cpp
index a70f3602..be65df60 100644
--- a/src/sfizz/Defaults.cpp
+++ b/src/sfizz/Defaults.cpp
@@ -104,7 +104,7 @@ FloatSpec filterGainMod { 0.0f, {-96.0f, 96.0f}, kPermissiveBounds };
 FloatSpec filterRandom { 0.0f, {-12000.0f, 12000.0f}, kPermissiveBounds };
 FloatSpec filterKeytrack { 0, {0, 1200}, kPermissiveBounds };
 FloatSpec filterVeltrack { 0, {-12000, 12000}, kPermissiveBounds };
-FloatSpec filterVeltrackMod { 0.0f, {-100.0f, 100.0f}, kNormalizePercent|kPermissiveBounds };
+FloatSpec filterVeltrackMod { 0.0f, {-12000, 12000}, kPermissiveBounds };
 FloatSpec eqBandwidth { 1.0f, {0.001f, 4.0f}, kPermissiveBounds };
 FloatSpec eqBandwidthMod { 0.0f, {-4.0f, 4.0f}, kPermissiveBounds };
 FloatSpec eqFrequency { 0.0f, {0.0f, 20000.0f}, kPermissiveBounds };
@@ -116,7 +116,7 @@ FloatSpec eqVel2Gain { 0.0f, {-96.0f, 96.0f}, kPermissiveBounds };
 FloatSpec pitchKeytrack { 100, {-1200, 1200}, kPermissiveBounds };
 FloatSpec pitchRandom { 0.0f, {-12000.0f, 12000.0f}, kPermissiveBounds };
 FloatSpec pitchVeltrack { 0, {-12000, 12000}, kPermissiveBounds };
-FloatSpec pitchVeltrackMod { 0.0f, {-100.0f, 100.0f}, kNormalizePercent|kPermissiveBounds };
+FloatSpec pitchVeltrackMod { 0.0f, {-12000, 12000}, kPermissiveBounds };
 FloatSpec transpose { 0, {-127, 127}, kPermissiveBounds };
 FloatSpec pitch { 0.0f, {-2400.0f, 2400.0f}, kPermissiveBounds };
 FloatSpec pitchMod { 0.0f, {-2400.0f, 2400.0f}, kPermissiveBounds };
diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp
index 07b327fa..5832e07f 100644
--- a/src/sfizz/Region.cpp
+++ b/src/sfizz/Region.cpp
@@ -645,7 +645,7 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode, bool cleanOpcode)
             if (cc >= config::numCCs)
                 return false;
 
-            filters[filterIndex].veltrackCC[cc].modifier = opcode.read(Default::ampVeltrackMod);
+            filters[filterIndex].veltrackCC[cc].modifier = opcode.read(Default::filterVeltrackMod);
         }
         break;
     case hash("fil&_veltrack_curvecc&"):
diff --git a/src/sfizz/SynthMessaging.cpp b/src/sfizz/SynthMessaging.cpp
index ce0c62b3..36f4bc03 100644
--- a/src/sfizz/SynthMessaging.cpp
+++ b/src/sfizz/SynthMessaging.cpp
@@ -945,7 +945,7 @@ void sfz::Synth::dispatchMessage(Client& client, int delay, const char* path, co
             GET_REGION_OR_BREAK(indices[0])
             if (region.pitchVeltrackCC.contains(indices[1])) {
                 const auto& cc = region.pitchVeltrackCC.getWithDefault(indices[1]);
-                client.receive<'f'>(delay, path, cc.modifier * 100.0f);
+                client.receive<'f'>(delay, path, cc.modifier);
             } else {
                 client.receive<'N'>(delay, path, {});
             }
@@ -1322,7 +1322,7 @@ void sfz::Synth::dispatchMessage(Client& client, int delay, const char* path, co
             GET_FILTER_OR_BREAK(indices[1])
             if (filter.veltrackCC.contains(indices[2])) {
                 const auto& cc = filter.veltrackCC.getWithDefault(indices[2]);
-                client.receive<'f'>(delay, path, cc.modifier * 100.0f);
+                client.receive<'f'>(delay, path, cc.modifier);
             } else {
                 client.receive<'N'>(delay, path, {});
             }