From 3b7f6239bc93bf5e845758a385e711d9221be4b8 Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Fri, 17 Sep 2021 16:52:48 +0100
Subject: [PATCH] Named Normalize

---
 release-packaging/Classes/FluidNormalize.sc | 25 ++++++++++++++++-----
 src/FluidManipulation/FluidManipulation.cpp |  4 +++-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/release-packaging/Classes/FluidNormalize.sc b/release-packaging/Classes/FluidNormalize.sc
index 94eb422..dc85c48 100644
--- a/release-packaging/Classes/FluidNormalize.sc
+++ b/release-packaging/Classes/FluidNormalize.sc
@@ -1,4 +1,4 @@
-FluidNormalize : FluidRealTimeModel {
+FluidNormalize : FluidModelObject {
 
     var <>min, <>max, <>invert;
 
@@ -8,7 +8,7 @@ FluidNormalize : FluidRealTimeModel {
 	}
 
     prGetParams{
-        ^[this.min,this.max,this.invert,-1,-1];
+        ^[this.id, this.min,this.max,this.invert,-1,-1];
     }
 
 
@@ -52,7 +52,7 @@ FluidNormalize : FluidRealTimeModel {
         this.prSendMsg(this.transformPointMsg(sourceBuffer, destBuffer));
 	}
 
-    kr{|trig, inputBuffer,outputBuffer,min,max,invert|
+    kr{|trig, inputBuffer,outputBuffer,min = 0 ,max = 1,invert = 0|
 
         min = min ? this.min;
         max = max ? this.max;
@@ -60,11 +60,24 @@ FluidNormalize : FluidRealTimeModel {
 
         this.min_(min).max_(max).invert_(invert);
 
-        ^FluidNormalizeQuery.kr( K2A.ar(trig),
-                this, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer)); 
+        ^FluidNormalizeQuery.kr(trig,
+                this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), this.min, this.max, this.invert);
     }
 
 
 }
 
-FluidNormalizeQuery : FluidRTQuery {}
+FluidNormalizeQuery : FluidRTMultiOutUGen {
+
+    *kr{ |trig, model,inputBuffer,outputBuffer,min = 0 ,max = 1,invert = 0|
+        inputBuffer.asUGenInput.postln;
+        ^this.multiNew('control',trig, model.asUGenInput,
+            min,max,invert,
+            inputBuffer.asUGenInput, outputBuffer.asUGenInput)
+    }
+
+    init { arg ... theInputs;
+		inputs = theInputs;
+		^this.initOutputs(1, rate);
+	}
+}
\ No newline at end of file
diff --git a/src/FluidManipulation/FluidManipulation.cpp b/src/FluidManipulation/FluidManipulation.cpp
index 8900285..68e9f59 100644
--- a/src/FluidManipulation/FluidManipulation.cpp
+++ b/src/FluidManipulation/FluidManipulation.cpp
@@ -42,7 +42,9 @@ PluginLoad(FluidSTFTUGen)
   makeSCWrapper<NRTThreadedKNNRegressorClient>("FluidKNNRegressor",ft);
   makeSCWrapper<RTKNNRegressorQueryClient>("FluidKNNRegressorQuery",ft);
   
-  makeSCWrapper<RTNormalizeClient>("FluidNormalize",ft);
+  makeSCWrapper<NRTThreadedNormalizeClient>("FluidNormalize",ft);
+  makeSCWrapper<RTNormalizeQueryClient>("FluidNormalizeQuery",ft);
+  
   makeSCWrapper<RTRobustScaleClient>("FluidRobustScale",ft);
   makeSCWrapper<RTStandardizeClient>("FluidStandardize",ft);
   makeSCWrapper<RTPCAClient>("FluidPCA",ft);