lcoogan
/
flucoma-sc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/UGensAsClasses' into clients/inter_client_comms

Browse Source
nix
Owen Green 5 years ago
parent bdcf5b0474 3e0ee81eea
commit 4a4a2350f6
36 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
include/wrapper/NonRealtime.hpp
Unescape Escape View File

@ -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();
}

1
release-packaging/Classes/FluidBufAmpGate.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufAmpSlice.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufAudioTransport.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufCompose.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufFlatten.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufHPSS.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufLoudness.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufMFCC.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufMelBands.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufNMF.sc
Unescape Escape View File

@ -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 {}

1
release-packaging/Classes/FluidBufNMFCross.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufNNDSVD.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufNoveltySlice.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufOnsetSlice.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufPitch.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufScale.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufSines.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufSpectralShape.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufStats.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufThreadDemo.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufThresh.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufTransientSlice.sc
Unescape Escape View File

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

1
release-packaging/Classes/FluidBufTransients.sc
Unescape Escape View File

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

2
release-packaging/Classes/FluidDataSetWr.sc
Unescape Escape View File

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

6
release-packaging/Classes/FluidKDTree.sc
Unescape Escape View File

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

6
release-packaging/Classes/FluidKMeans.sc
Unescape Escape View File

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

6
release-packaging/Classes/FluidKNNClassifier.sc
Unescape Escape View File

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

6
release-packaging/Classes/FluidKNNRegressor.sc
Unescape Escape View File

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

9
release-packaging/Classes/FluidMLP.sc
Unescape Escape View File

@ -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),
id, *params);
^FluidMLPRegressorQuery.kr(K2A.ar(trig),this, *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),
id, *params);
^FluidMLPClassifierQuery.kr(K2A.ar(trig),this, *params);
}
}
FluidMLPClassifierQuery : FluidRTQuery {}

6
release-packaging/Classes/FluidNormalize.sc
Unescape Escape View File

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

5
release-packaging/Classes/FluidPCA.sc
Unescape Escape View File

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

5
release-packaging/Classes/FluidRobustScale.sc
Unescape Escape View File

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

7
release-packaging/Classes/FluidServerObject.sc
Unescape Escape View File

@ -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)
}
}

5
release-packaging/Classes/FluidStandardize.sc
Unescape Escape View File

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

6
release-packaging/Classes/FluidUMAP.sc
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save