From eda82ccc6e14cdbdd0d3bc4b78f24213f6d1a2a1 Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Fri, 17 Sep 2021 22:55:59 +0100
Subject: [PATCH] Named Standardize

---
 release-packaging/Classes/FluidStandardize.sc | 19 +++++++++++++++----
 src/FluidManipulation/FluidManipulation.cpp   |  5 ++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/release-packaging/Classes/FluidStandardize.sc b/release-packaging/Classes/FluidStandardize.sc
index dca033c..b4127b8 100644
--- a/release-packaging/Classes/FluidStandardize.sc
+++ b/release-packaging/Classes/FluidStandardize.sc
@@ -1,4 +1,4 @@
-FluidStandardize : FluidRealTimeModel {
+FluidStandardize : FluidModelObject {
 
     var <>invert;
 
@@ -7,7 +7,7 @@ FluidStandardize : FluidRealTimeModel {
 	}
 
     prGetParams{
-        ^[this.invert, -1, 1];
+        ^[this.id, this.invert];
     }
 
 	fitMsg{|dataSet|
@@ -52,8 +52,19 @@ FluidStandardize : FluidRealTimeModel {
         invert = invert ? this.invert;
         this.invert_(invert);
 
-        ^FluidStandardizeQuery.kr(K2A.ar(trig),this, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+        ^FluidStandardizeQuery.kr(trig,this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), this.invert);
     }
 }
 
-FluidStandardizeQuery : FluidRTQuery {}
+FluidStandardizeQuery : FluidRTMultiOutUGen {
+   *kr{ |trig, model,inputBuffer,outputBuffer,invert = 0|
+        ^this.multiNew('control',trig, model.asUGenInput,
+            invert,
+            inputBuffer.asUGenInput, outputBuffer.asUGenInput)
+    }
+
+    init { arg ... theInputs;
+		inputs = theInputs;
+		^this.initOutputs(1, rate);
+	}
+}
diff --git a/src/FluidManipulation/FluidManipulation.cpp b/src/FluidManipulation/FluidManipulation.cpp
index 68e9f59..5237f30 100644
--- a/src/FluidManipulation/FluidManipulation.cpp
+++ b/src/FluidManipulation/FluidManipulation.cpp
@@ -46,7 +46,10 @@ PluginLoad(FluidSTFTUGen)
   makeSCWrapper<RTNormalizeQueryClient>("FluidNormalizeQuery",ft);
   
   makeSCWrapper<RTRobustScaleClient>("FluidRobustScale",ft);
-  makeSCWrapper<RTStandardizeClient>("FluidStandardize",ft);
+  
+  makeSCWrapper<NRTThreadedStandardizeClient>("FluidStandardize",ft);
+  makeSCWrapper<RTStandardizeQueryClient>("FluidStandardizeQuery",ft);
+  
   makeSCWrapper<RTPCAClient>("FluidPCA",ft);
   makeSCWrapper<NRTThreadedMDSClient>("FluidMDS",ft);
   makeSCWrapper<RTUMAPClient>("FluidUMAP",ft);