From b5cb624697783d78310fcc2d91dff0c6cd26fd1d Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Fri, 12 Feb 2021 10:16:39 +0100
Subject: [PATCH] Merge booboo between the PRs

---
 src/sfizz/Region.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp
index bd7342d6..ec07ad48 100644
--- a/src/sfizz/Region.cpp
+++ b/src/sfizz/Region.cpp
@@ -553,11 +553,9 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
             if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters))
                 return false;
 
-            if (auto value = readOpcode(opcode.value, Default::filterCutoffModRange)) {
-                const ModKey source = ModKey::createNXYZ(ModId::ChannelAftertouch);
-                const ModKey target = ModKey::createNXYZ(ModId::FilCutoff, id, filterIndex);
-                getOrCreateConnection(source, target).sourceDepth = *value;
-            }
+            const ModKey source = ModKey::createNXYZ(ModId::ChannelAftertouch);
+            const ModKey target = ModKey::createNXYZ(ModId::FilCutoff, id, filterIndex);
+            getOrCreateConnection(source, target).sourceDepth = opcode.read(Default::filterCutoffMod);
         }
         break;
     case hash("fil&_keytrack"): // also fil_keytrack
@@ -1532,7 +1530,6 @@ bool sfz::Region::registerNoteOff(int noteNumber, float velocity, float randValu
     return false;
 }
 
-    #include<iostream>
 bool sfz::Region::registerCC(int ccNumber, float ccValue) noexcept
 {
     ASSERT(ccValue >= 0.0f && ccValue <= 1.0f);