(Buf)MFCC.sc: Handle maxNumBands (#130)

release-packaging/Classes/FluidBufMFCC.sc

@@ -8,7 +8,7 @@ FluidBufMFCC : FluidBufProcessor{
         source.isNil.if {"FluidBufMFCC:  Invalid source buffer".throw};
         features.isNil.if {"FluidBufMFCC:  Invalid features buffer".throw};
 
-        ^FluidProxyUgen.kr(\FluidBufMFCCTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,trig, blocking);
+        ^FluidProxyUgen.kr(\FluidBufMFCCTrigger, -1, source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,trig, blocking);
     }
 
     *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, numCoeffs = 13, numBands = 40, startCoeff = 0, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, padding = 1, freeWhenDone=true, action |
@@ -23,7 +23,7 @@ FluidBufMFCC : FluidBufProcessor{
 		^this.new(
 			server, nil,[features]
 		).processList(
-			 [source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,0],freeWhenDone,action
+			 [source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands,  numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,0],freeWhenDone,action
 		);
     }
 
@@ -39,7 +39,7 @@ FluidBufMFCC : FluidBufProcessor{
 		^this.new(
 			server, nil,[features]
 		).processList(
-			 [source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,1],freeWhenDone,action
+			 [source, startFrame, numFrames, startChan, numChans, features, padding, numCoeffs, numCoeffs, numBands, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize,1],freeWhenDone,action
 		);
     }
 }

release-packaging/Classes/FluidMFCC.sc

@@ -1,10 +1,11 @@
 FluidMFCC : FluidRTMultiOutUGen {
 
-	*kr { arg in = 0, numCoeffs = 13, numBands = 40, startCoeff = 0, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, maxFFTSize = -1, maxNumCoeffs = nil;
+	*kr { arg in = 0, numCoeffs = 13, numBands = 40, startCoeff = 0, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, maxFFTSize = -1, maxNumCoeffs = nil, maxNumBands = nil;
 
         maxNumCoeffs = maxNumCoeffs ? numCoeffs;
+        maxNumBands =  maxNumBands ? numBands;
 
-		^this.multiNew('control', in.asAudioRateInput(this), numCoeffs, maxNumCoeffs, numBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize);
+		^this.multiNew('control', in.asAudioRateInput(this), numCoeffs, maxNumCoeffs, numBands, maxNumBands, startCoeff, minFreq, maxFreq, windowSize, hopSize, fftSize, maxFFTSize);
 	}
 
 
@@ -18,6 +19,9 @@ FluidMFCC : FluidRTMultiOutUGen {
 		if(inputs.at(2).rate != 'scalar') {
 			^(": maxNumCoeffs cannot be modulated.");
 		};
+        if(inputs.at(4).rate != 'scalar') {
+			^(": maxNumBands cannot be modulated.");
+		};
 		if(inputs.at(10).rate != 'scalar') {
 			^(": maxFFTSize cannot be modulated.");
 		};