Add AmpCurve, OnsetCurve, NoveltyCurve + buf versions (#79)
* Add AmpCurve, OnsetCurve, NoveltyCurve + buf versions * Classes: Rename <X>Curve -> <X>Feature * cpp plugins: <X>Curve -> <X>Feature * Curve -> Feature in SC / cpp code * Novelty<X>: feature -> algorithm for input algorithm choice * do rest of changes of feature -> algorithm * BufNoveltyFeature needs a shorter internal namenix
parent
1e13f59570
commit
8e0c71ec17
@ -0,0 +1,9 @@
|
|||||||
|
FluidAmpFeature : FluidRTUGen {
|
||||||
|
*ar { arg in = 0, fastRampUp = 1, fastRampDown = 1, slowRampUp = 100, slowRampDown = 100, floor = -144, highPassFreq = 85;
|
||||||
|
|
||||||
|
^this.multiNew('audio', in.asAudioRateInput(this), fastRampUp, fastRampDown, slowRampUp, slowRampDown, floor, highPassFreq)
|
||||||
|
}
|
||||||
|
checkInputs {
|
||||||
|
^this.checkValidInputs;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
FluidBufAmpFeature : FluidBufProcessor {
|
||||||
|
|
||||||
|
*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, fastRampUp = 1, fastRampDown = 1, slowRampUp = 100, slowRampDown = 100, floor = -144, highPassFreq = 85, trig = 1, blocking = 0|
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufAmpFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufAmpFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^FluidProxyUgen.kr(\FluidBufAmpFeatureTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, fastRampUp, fastRampDown, slowRampUp, slowRampDown, floor, highPassFreq, trig, blocking);
|
||||||
|
}
|
||||||
|
|
||||||
|
*process { |server,source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, fastRampUp = 1, fastRampDown = 1, slowRampUp = 100, slowRampDown = 100, floor = -144, highPassFreq = 85, freeWhenDone = true, action |
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufAmpFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufAmpFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(server, nil, [features]).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, fastRampUp, fastRampDown, slowRampUp, slowRampDown, floor, highPassFreq,0],freeWhenDone, action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
*processBlocking { |server,source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, fastRampUp = 1, fastRampDown = 1, slowRampUp = 100, slowRampDown = 100, floor = -144, highPassFreq = 85, freeWhenDone = true, action |
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufAmpFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufAmpFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(server, nil, [features]).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, fastRampUp, fastRampDown, slowRampUp, slowRampDown, floor, highPassFreq,1],freeWhenDone, action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluidBufAmpFeatureTrigger : FluidProxyUgen {}
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
FluidBufNoveltyFeature : FluidBufProcessor {
|
||||||
|
|
||||||
|
*objectClassName{
|
||||||
|
^\FluidBufNoveltyF
|
||||||
|
}
|
||||||
|
|
||||||
|
*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, algorithm = 0, kernelSize = 3, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, trig = 1, blocking = 0|
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufNoveltyFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufNoveltyFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^FluidProxyUgen.kr(\FluidBufNoveltyFeatureTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, padding, algorithm, kernelSize, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize, trig, blocking);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
*process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, algorithm= 0, kernelSize = 3, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, freeWhenDone = true, action |
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufNoveltyFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufNoveltyFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(
|
||||||
|
server, nil, [features]
|
||||||
|
).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, padding, algorithm, kernelSize, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize,0],freeWhenDone,action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
*processBlocking { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, algorithm= 0, kernelSize = 3, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, freeWhenDone = true, action |
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufNoveltyFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufNoveltyFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(
|
||||||
|
server, nil, [features]
|
||||||
|
).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, padding, algorithm, kernelSize, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize,1],freeWhenDone,action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluidBufNoveltyFeatureTrigger : FluidProxyUgen {}
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
FluidBufOnsetFeature : FluidBufProcessor {
|
||||||
|
*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, metric = 0, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, trig = 1, blocking = 0|
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufOnsetFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufOnsetFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^FluidProxyUgen.kr(\FluidBufOnsetFeatureTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, padding, metric, filterSize, frameDelta, windowSize, hopSize, fftSize, maxFFTSize, trig, blocking);
|
||||||
|
}
|
||||||
|
|
||||||
|
*process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, metric = 0, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, freeWhenDone = true, action|
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufOnsetFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufOnsetFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(
|
||||||
|
server, nil, [features]
|
||||||
|
).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, padding, metric, filterSize, frameDelta, windowSize, hopSize, fftSize,maxFFTSize,0],freeWhenDone,action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
*processBlocking { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, metric = 0, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1,padding = 1, freeWhenDone = true, action|
|
||||||
|
|
||||||
|
var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
|
||||||
|
|
||||||
|
source = source.asUGenInput;
|
||||||
|
features = features.asUGenInput;
|
||||||
|
|
||||||
|
source.isNil.if {"FluidBufOnsetFeature: Invalid source buffer".throw};
|
||||||
|
features.isNil.if {"FluidBufOnsetFeature: Invalid features buffer".throw};
|
||||||
|
|
||||||
|
^this.new(
|
||||||
|
server, nil, [features]
|
||||||
|
).processList(
|
||||||
|
[source, startFrame, numFrames, startChan, numChans, features, padding, metric, filterSize, frameDelta, windowSize, hopSize, fftSize,maxFFTSize,1],freeWhenDone,action
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FluidBufOnsetFeatureTrigger : FluidProxyUgen {}
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
FluidNoveltyFeature : FluidRTUGen {
|
||||||
|
*kr { arg in = 0, algorithm = 0, kernelSize = 3, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, maxFFTSize = 16384, maxKernelSize = 101, maxFilterSize = 100;
|
||||||
|
^this.multiNew('control', in.asAudioRateInput(this), algorithm, kernelSize, filterSize, windowSize, hopSize, fftSize, maxFFTSize, maxKernelSize, maxFilterSize)
|
||||||
|
}
|
||||||
|
checkInputs {
|
||||||
|
if(inputs.at(6).rate != 'scalar') {
|
||||||
|
^(": maxFFTSize cannot be modulated.");
|
||||||
|
};
|
||||||
|
if(inputs.at(7).rate != 'scalar') {
|
||||||
|
^(": maxKernelSize cannot be modulated.");
|
||||||
|
};
|
||||||
|
if(inputs.at(8).rate != 'scalar') {
|
||||||
|
^(": maxFilterSize cannot be modulated.");
|
||||||
|
};
|
||||||
|
^this.checkValidInputs;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
FluidOnsetFeature : FluidRTUGen {
|
||||||
|
*kr { arg in = 0, metric = 0, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, maxFFTSize = 16384;
|
||||||
|
^this.multiNew('control', in.asAudioRateInput(this), metric, filterSize, frameDelta, windowSize, hopSize, fftSize, maxFFTSize)
|
||||||
|
}
|
||||||
|
checkInputs {
|
||||||
|
if(inputs.at(7).rate != 'scalar') {
|
||||||
|
^(": maxFFTSize cannot be modulated.");
|
||||||
|
};
|
||||||
|
^this.checkValidInputs;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue