From f8801e78e428b2c0a911fd21df6651e75767d7b8 Mon Sep 17 00:00:00 2001
From: Paul Fd <paul@ferrand.cc>
Date: Mon, 16 Mar 2020 23:47:54 +0100
Subject: [PATCH] Change numCC to uint16_t and increase the max number of ccs

---
 src/sfizz/Config.h      |  2 +-
 src/sfizz/Defaults.h    |  2 +-
 src/sfizz/MidiState.cpp |  2 +-
 src/sfizz/Synth.cpp     | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/sfizz/Config.h b/src/sfizz/Config.h
index e1bab309..eda45b81 100644
--- a/src/sfizz/Config.h
+++ b/src/sfizz/Config.h
@@ -52,7 +52,7 @@ namespace config {
     constexpr float A440 { 440.0 };
     constexpr size_t powerHistoryLength { 16 };
     constexpr float voiceStealingThreshold { 0.00001f };
-    constexpr uint8_t numCCs { 143 };
+    constexpr uint16_t numCCs { 512 };
     constexpr int chunkSize { 1024 };
     constexpr float defaultAmpEGRelease { 0.02f };
     constexpr int filtersInPool { maxVoices * 2 };
diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h
index 71741b5a..8daf2384 100644
--- a/src/sfizz/Defaults.h
+++ b/src/sfizz/Defaults.h
@@ -69,7 +69,7 @@ namespace Default
     // Region logic: MIDI conditions
 	constexpr Range<uint8_t> channelRange { 1, 16 };
 	constexpr Range<uint8_t> midiChannelRange { 0, 15 };
-	constexpr Range<uint8_t> ccNumberRange { 0, config::numCCs };
+	constexpr Range<uint16_t> ccNumberRange { 0, config::numCCs };
 	constexpr Range<uint8_t> ccValueRange { 0, 127 };
 	constexpr uint8_t cc { 0 };
 	constexpr Range<int> bendRange { -8192, 8192 };
diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp
index 0c812af4..23fd7ab9 100644
--- a/src/sfizz/MidiState.cpp
+++ b/src/sfizz/MidiState.cpp
@@ -104,7 +104,7 @@ void sfz::MidiState::reset(int delay) noexcept
 
 void sfz::MidiState::resetAllControllers(int delay) noexcept
 {
-    for (int idx = 0; idx < config::numCCs; idx++)
+    for (unsigned idx = 0; idx < config::numCCs; idx++)
         cc[idx] = 0;
 
     pitchBend = 0;
diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
index 9ef64406..fd36c0e0 100644
--- a/src/sfizz/Synth.cpp
+++ b/src/sfizz/Synth.cpp
@@ -379,14 +379,14 @@ bool sfz::Synth::loadSfzFile(const fs::path& file)
                 noteActivationLists[note].push_back(region);
         }
 
-        for (auto cc = 0; cc < config::numCCs; cc++) {
+        for (unsigned cc = 0; cc < config::numCCs; cc++) {
             if (region->ccTriggers.contains(cc) || region->ccConditions.contains(cc))
                 ccActivationLists[cc].push_back(region);
         }
 
         // Defaults
-        for (int ccIndex = 0; ccIndex < config::numCCs; ccIndex++) {
-            region->registerCC(ccIndex, resources.midiState.getCCValue(ccIndex));
+        for (unsigned cc = 0; cc < config::numCCs; cc++) {
+            region->registerCC(cc, resources.midiState.getCCValue(cc));
         }
 
         if (defaultSwitch) {
@@ -953,12 +953,12 @@ void sfz::Synth::resetAllControllers(int delay) noexcept
     resources.midiState.resetAllControllers(delay);
     for (auto& voice: voices) {
         voice->registerPitchWheel(delay, 0);
-        for (int cc = 0; cc < config::numCCs; ++cc)
+        for (unsigned cc = 0; cc < config::numCCs; ++cc)
             voice->registerCC(delay, cc, 0);
     }
 
     for (auto& region: regions) {
-        for (int cc = 0; cc < config::numCCs; ++cc)
+        for (unsigned cc = 0; cc < config::numCCs; ++cc)
             region->registerCC(cc, 0);
     }
 }