Merge branch 'fix/UGensAsClasses' into clients/inter_client_comms

include/wrapper/NonRealtime.hpp

@@ -808,7 +808,7 @@ namespace impl {
       
       static const char* name()
       {
-        static std::string n = std::string(Wrapper::getName()) + "/query";
+        static std::string n = std::string(Wrapper::getName()) + "Query";
         return n.c_str();
       }
             

release-packaging/Classes/FluidBufAmpGate.sc

@@ -41,3 +41,4 @@ FluidBufAmpGate : FluidBufProcessor {
    }
    
 }
+FluidBufAmpGateTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufAmpSlice.sc

@@ -37,3 +37,4 @@ FluidBufAmpSlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufAmpSliceTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufAudioTransport.sc

@@ -56,3 +56,4 @@ FluidBufAudioTransport : FluidBufProcessor {
 		)
 	}
 }
+FluidBufAudioTransportTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufCompose.sc

@@ -36,3 +36,4 @@ FluidBufCompose : FluidBufProcessor {
        ).processList([source, startFrame, numFrames, startChan, numChans, gain, destination, destStartFrame, destStartChan, destGain, 1], freeWhenDone, action);
 	}
 }
+FluidBufComposeTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufFlatten.sc

@@ -44,3 +44,4 @@ FluidBufFlatten : FluidBufProcessor {
 
    }
 }
+FluidBufFlattenTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufHPSS.sc

@@ -49,3 +49,4 @@ FluidBufHPSS : FluidBufProcessor {
 
  	}
 }
+FluidBufHPSSTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufLoudness.sc

@@ -46,3 +46,4 @@ FluidBufLoudness : FluidBufProcessor{
 		);
     }
 }
+FluidBufLoudnessTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufMFCC.sc

@@ -43,3 +43,4 @@ FluidBufMFCC : FluidBufProcessor{
 		);
     }
 }
+FluidBufMFCCTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufMelBands.sc

@@ -48,3 +48,4 @@ FluidBufMelBands : FluidBufProcessor {
         );
 	}
 }
+FluidBufMelBandsTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufNMF.sc

@@ -34,3 +34,4 @@ FluidBufNMF : FluidBufProcessor //: UGen {
         ).processList([source, startFrame, numFrames, startChan, numChans, resynth, bases, basesMode, activations, actMode, components,iterations, windowSize, hopSize, fftSize, 1],freeWhenDone,action); 
     }
 }
+FluidBufNMFTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufNMFCross.sc

@@ -46,3 +46,4 @@ FluidBufNMFCross : FluidBufProcessor {
 		);
 	}
 }
+FluidBufNMFCrossTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufNNDSVD.sc

@@ -45,3 +45,4 @@ FluidBufNNDSVD : FluidBufProcessor{
 		)
 	}
 }
+FluidBufNNDSVDTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufNoveltySlice.sc

@@ -48,3 +48,4 @@ FluidBufNoveltySlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufNoveltySliceTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufOnsetSlice.sc

@@ -46,3 +46,4 @@ FluidBufOnsetSlice : FluidBufProcessor {
 		);
 	}
 }
+FluidBufOnsetSliceTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufPitch.sc

@@ -48,3 +48,4 @@ FluidBufPitch : FluidBufProcessor{
 		);
 	}
 }
+FluidBufPitchTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufScale.sc

@@ -41,3 +41,4 @@ FluidBufScale : FluidBufProcessor {
 		);
 	}
 }
+FluidBufScaleTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufSines.sc

@@ -48,3 +48,4 @@ FluidBufSines : FluidBufProcessor {
 	}
 
 }
+FluidBufSinesTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufSpectralShape.sc

@@ -52,3 +52,4 @@ FluidBufSpectralShape : FluidBufProcessor {
 		);
 	}
 }
+FluidBufSpectralShapeTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufStats.sc

@@ -49,3 +49,4 @@ FluidBufStats : FluidBufProcessor {
 
 
 }
+FluidBufStatsTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufThreadDemo.sc

@@ -31,3 +31,4 @@ FluidBufThreadDemo : FluidBufProcessor{
 		);
     }
 }
+FluidBufThreadDemoTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufThresh.sc

@@ -43,3 +43,4 @@ FluidBufThresh : FluidBufProcessor {
 
 	}
 }
+FluidBufThreshTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufTransientSlice.sc

@@ -41,3 +41,4 @@ FluidBufTransientSlice : FluidBufProcessor {
         );
     }
 }
+FluidBufTransientSliceTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidBufTransients.sc

@@ -41,3 +41,4 @@ FluidBufTransients : FluidBufProcessor {
        );
    }
 }
+FluidBufTransientsTrigger : FluidProxyUgen {}

release-packaging/Classes/FluidDataSetWr.sc

@@ -9,3 +9,5 @@ FluidDataSetWr : FluidBufProcessor {
         ^FluidProxyUgen.kr(\FluidDataSetWrTrigger,*args);
 	}
 }
+
+FluidDataSetWrTrigger : FluidProxyUgen {} 

release-packaging/Classes/FluidKDTree.sc

@@ -51,10 +51,12 @@ FluidKDTree : FluidRealTimeModel
         lookupDataSet = lookupDataSet ? -1;
         this.lookupDataSet_(lookupDataSet);
         this.lookupDataSet.asUGenInput.postln;
-        ^FluidProxyUgen.kr('FluidKDTree/query', K2A.ar(trig),
+        ^FluidKDTreeQuery.kr(K2A.ar(trig),
-                id, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
+                this, this.numNeighbours, this.radius, this.lookupDataSet.asUGenInput,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidKDTreeQuery : FluidRTQuery {}

release-packaging/Classes/FluidKMeans.sc

@@ -60,9 +60,11 @@ FluidKMeans : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr('FluidKMeans/query', K2A.ar(trig),
+        ^FluidKMeansQuery.kr(K2A.ar(trig),
-                id, clusters, maxiter,
+                this, clusters, maxiter,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidKMeansQuery : FluidRTQuery {}

release-packaging/Classes/FluidKNNClassifier.sc

@@ -38,10 +38,12 @@ FluidKNNClassifier : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidKNNClassifierQuery.kr(K2A.ar(trig),
-                id, this.numNeighbours, this.weight,
+                this, this.numNeighbours, this.weight,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidKNNClassifierQuery : FluidRTQuery {}

release-packaging/Classes/FluidKNNRegressor.sc

@@ -38,9 +38,11 @@ FluidKNNRegressor : FluidRealTimeModel {
 	}
 
     kr{|trig, inputBuffer,outputBuffer|
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidKNNRegressorQuery.kr(K2A.ar(trig),
-                id, this.numNeighbours, this.weight,
+                this, this.numNeighbours, this.weight,
                 this.prEncodeBuffer(inputBuffer),
                 this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidKNNRegressorQuery : FluidRTQuery {}

release-packaging/Classes/FluidMLP.sc

@@ -75,12 +75,12 @@ FluidMLPRegressor : FluidRealTimeModel {
         params = this.prGetParams.drop(-2) ++ [this.prEncodeBuffer(inputBuffer),
         this.prEncodeBuffer(outputBuffer)];
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidMLPRegressorQuery.kr(K2A.ar(trig),this, *params);
-                id, *params);
     }
 
 }
 
+FluidMLPRegressorQuery : FluidRTQuery {}
 
 FluidMLPClassifier : FluidRealTimeModel {
 
@@ -145,7 +145,8 @@ FluidMLPClassifier : FluidRealTimeModel {
         var params = this.prGetParams.drop(-2) ++  [this.prEncodeBuffer(inputBuffer),
         this.prEncodeBuffer(outputBuffer)];
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidMLPClassifierQuery.kr(K2A.ar(trig),this, *params);
-                id, *params);
     }
 }
+
+FluidMLPClassifierQuery : FluidRTQuery {}

release-packaging/Classes/FluidNormalize.sc

@@ -60,9 +60,11 @@ FluidNormalize : FluidRealTimeModel {
 
         this.min_(min).max_(max).invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidNormalizeQuery.kr( K2A.ar(trig),
-                id, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
+                this, this.min, this.max, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer)); 
     }
 
 
 }
+
+FluidNormalizeQuery : FluidRTQuery {}

release-packaging/Classes/FluidPCA.sc

@@ -55,8 +55,9 @@ FluidPCA : FluidRealTimeModel{
         numDimensions = numDimensions ? this.numDimensions;
         this.numDimensions_(numDimensions);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidPCAQuery.kr(K2A.ar(trig),this, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
-                id, this.numDimensions, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 
 }
+
+FluidPCAQuery : FluidRTQuery {}

release-packaging/Classes/FluidRobustScale.sc

@@ -60,9 +60,10 @@ FluidRobustScale : FluidRealTimeModel {
 
         this.low_(low).high_(high).invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidRobustScaleQuery.kr(K2A.ar(trig),this, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
-                id, this.low, this.high, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 
 
 }
+
+FluidRobustScaleQuery : FluidRTQuery {}

release-packaging/Classes/FluidServerObject.sc

@@ -308,3 +308,10 @@ FluidRealTimeModel : FluidModelObject
         ^super.new(server,params++[-1,-1]);
     }
 }
+
+FluidRTQuery : FluidProxyUgen
+{
+    *kr{ |trig, obj, args|
+        ^super.kr(this.name,trig, obj.asUGenInput, *args) 
+    }
+}

release-packaging/Classes/FluidStandardize.sc

@@ -52,7 +52,8 @@ FluidStandardize : FluidRealTimeModel {
         invert = invert ? this.invert;
         this.invert_(invert);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidStandardizeQuery.kr(K2A.ar(trig),this, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
-                id, this.invert, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer));
     }
 }
+
+FluidStandardizeQuery : FluidRTQuery {}

release-packaging/Classes/FluidUMAP.sc

@@ -68,8 +68,8 @@ FluidUMAP : FluidRealTimeModel {
         numDimensions = numDimensions ? this.numDimensions;
         this.numDimensions_(numDimensions);
 
-        ^FluidProxyUgen.kr(this.class.name.asString++'/query', K2A.ar(trig),
+        ^FluidUMAPQuery.kr(K2A.ar(trig),
-                id,
+            this,
 			this.numDimensions,
 			this.numNeighbours,
             this.minDist,
@@ -83,3 +83,5 @@ FluidUMAP : FluidRealTimeModel {
 	cols {|action|}
 	size { |action|}
 }
+
+FluidUMAPQuery : FluidRTQuery {}