From e75c148c670e5371c0e76096a8f84127acb90af1 Mon Sep 17 00:00:00 2001
From: Jean Pierre Cimalando <jp-dev@inbox.ru>
Date: Mon, 8 Feb 2021 20:14:07 +0100
Subject: [PATCH] Rename VST CC, not necessarily MIDI

---
 plugins/vst/SfizzVstController.cpp |  6 +++---
 plugins/vst/SfizzVstParameters.h   | 14 +++++++-------
 plugins/vst/SfizzVstProcessor.cpp  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/vst/SfizzVstController.cpp b/plugins/vst/SfizzVstController.cpp
index 122936e1..6717f685 100644
--- a/plugins/vst/SfizzVstController.cpp
+++ b/plugins/vst/SfizzVstController.cpp
@@ -80,14 +80,14 @@ tresult PLUGIN_API SfizzVstControllerNoUi::initialize(FUnknown* context)
         Vst::ParamID id = Vst::kNoParamId;
         switch (i) {
         case Vst::kAfterTouch:
-            id = kPidMidiAftertouch;
+            id = kPidAftertouch;
             break;
         case Vst::kPitchBend:
-            id = kPidMidiPitchBend;
+            id = kPidPitchBend;
             break;
         default:
             if (i < 128)
-                id = kPidMidiCC0 + i;
+                id = kPidCC0 + i;
             break;
         }
         midiMapping_[i] = id;
diff --git a/plugins/vst/SfizzVstParameters.h b/plugins/vst/SfizzVstParameters.h
index 7d5c5253..e9367c8d 100644
--- a/plugins/vst/SfizzVstParameters.h
+++ b/plugins/vst/SfizzVstParameters.h
@@ -20,10 +20,10 @@ enum {
     kPidScalaRootKey,
     kPidTuningFrequency,
     kPidStretchedTuning,
-    kPidMidiAftertouch,
-    kPidMidiPitchBend,
-    kPidMidiCC0,
-    kPidMidiCCLast = kPidMidiCC0 + sfz::config::numCCs - 1,
+    kPidAftertouch,
+    kPidPitchBend,
+    kPidCC0,
+    kPidCCLast = kPidCC0 + sfz::config::numCCs - 1,
     /* Reserved */
 };
 
@@ -67,12 +67,12 @@ struct SfizzRange {
             return {440.0, 300.0, 500.0};
         case kPidStretchedTuning:
             return {0.0, 0.0, 1.0};
-        case kPidMidiAftertouch:
+        case kPidAftertouch:
             return {0.0, 0.0, 1.0};
-        case kPidMidiPitchBend:
+        case kPidPitchBend:
             return {0.5, 0.0, 1.0};
         default:
-            if (id >= kPidMidiCC0 && id <= kPidMidiCCLast)
+            if (id >= kPidCC0 && id <= kPidCCLast)
                 return {0.0, 0.0, 1.0};
             throw std::runtime_error("Bad parameter ID");
         }
diff --git a/plugins/vst/SfizzVstProcessor.cpp b/plugins/vst/SfizzVstProcessor.cpp
index 972b34dc..cde5c319 100644
--- a/plugins/vst/SfizzVstProcessor.cpp
+++ b/plugins/vst/SfizzVstProcessor.cpp
@@ -385,8 +385,8 @@ void SfizzVstProcessor::processControllerChanges(Vst::IParameterChanges& pc)
 
         switch (id) {
         default:
-            if (id >= kPidMidiCC0 && id <= kPidMidiCCLast) {
-                auto ccNumber = static_cast<int>(id - kPidMidiCC0);
+            if (id >= kPidCC0 && id <= kPidCCLast) {
+                auto ccNumber = static_cast<int>(id - kPidCC0);
                 for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
                     if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
                         synth.cc(sampleOffset, ccNumber, fastRound(value * 127.0));
@@ -394,14 +394,14 @@ void SfizzVstProcessor::processControllerChanges(Vst::IParameterChanges& pc)
             }
             break;
 
-        case kPidMidiAftertouch:
+        case kPidAftertouch:
             for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
                 if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
                     synth.aftertouch(sampleOffset, fastRound(value * 127.0));
             }
             break;
 
-        case kPidMidiPitchBend:
+        case kPidPitchBend:
             for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
                 if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
                     synth.pitchWheel(sampleOffset, fastRound(value * 16383) - 8192);