Changes to the other objects to make them thready

* .cpp stub references threaded template, changes name to full name of SC class
* SC class gets kr method, process wraps this

release-packaging/Classes/FluidBufAmpSlice.sc

@@ -1,5 +1,8 @@
-FluidBufAmpSlice{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, absRampUp = 10, absRampDown = 10, absThreshOn = -90, absThreshOff = -90, minSliceLength = 1, minSilenceLength = 1, minLengthAbove = 1, minLengthBelow = 1, lookBack = 0, lookAhead = 0, relRampUp = 1, relRampDown = 1, relThreshOn = 144, relThreshOff = -144, highPassFreq = 85, action;
+FluidBufAmpSlice : UGen {
+
+    var <>server, <>synth;
+
+	*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, absRampUp = 10, absRampDown = 10, absThreshOn = -90, absThreshOff = -90, minSliceLength = 1, minSilenceLength = 1, minLengthAbove = 1, minLengthBelow = 1, lookBack = 0, lookAhead = 0, relRampUp = 1, relRampDown = 1, relThreshOn = 144, relThreshOff = -144, highPassFreq = 85, doneAction = 0|
 
 		var maxSize = max(minLengthAbove + lookBack, max(minLengthBelow,lookAhead));
 
@@ -9,13 +12,42 @@ FluidBufAmpSlice{
 		source.isNil.if {"FluidBufAmpSlice:  Invalid source buffer".throw};
 		indices.isNil.if {"FluidBufAmpSlice:  Invalid features buffer".throw};
 
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, indices, absRampUp, absRampDown, absThreshOn, absThreshOff, minSliceLength, minSilenceLength, minLengthAbove, minLengthBelow, lookBack, lookAhead, relRampUp, relRampDown, relThreshOn, relThreshOff, highPassFreq, maxSize, 0, doneAction);
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, absRampUp = 10, absRampDown = 10, absThreshOn = -90, absThreshOff = -90, minSliceLength = 1, minSilenceLength = 1, minLengthAbove = 1, minLengthBelow = 1, lookBack = 0, lookAhead = 0, relRampUp = 1, relRampDown = 1, relThreshOn = 144, relThreshOff = -144, highPassFreq = 85, action|
+
+        var instance,synth;
+
+		source = source.asUGenInput;
+		indices = indices.asUGenInput;
+
+		source.isNil.if {"FluidBufAmpSlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufAmpSlice:  Invalid features buffer".throw};
+
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = {instance = FluidBufAmpSlice.kr(source, startFrame, numFrames, startChan, numChans, indices, absRampUp, absRampDown, absThreshOn, absThreshOff, minSliceLength, minSilenceLength, minLengthAbove, minLengthBelow, lookBack, lookAhead, relRampUp, relRampDown, relThreshOn, relThreshOff, highPassFreq, doneAction: Done.freeSelf)}.play(server);
 
          forkIfNeeded{
-			server.sendMsg(\cmd, \BufAmpSlice, source, startFrame, numFrames, startChan, numChans, indices, absRampUp, absRampDown, absThreshOn, absThreshOff, minSliceLength, minSilenceLength, minLengthAbove, minLengthBelow, lookBack, lookAhead, relRampUp, relRampDown, relThreshOn, relThreshOff, highPassFreq, maxSize, 0);
+            synth.waitForFree;
+			server.sync;
+			indices = server.cachedBufferAt(indices);
+            indices.updateInfo;
             server.sync;
-			indices = server.cachedBufferAt(indices); indices.updateInfo; server.sync;
 			action.value(indices);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
+
 }

release-packaging/Classes/FluidBufCompose.sc

@@ -1,6 +1,24 @@
-FluidBufCompose{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, gain = 1, destination, destStartFrame = 0, destStartChan = 0, destGain = 0, action;
+FluidBufCompose : UGen {
 
+    var <>server, <>synth;
+
+    *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, gain = 1, destination, destStartFrame = 0, destStartChan = 0, destGain = 0, doneAction = 0|
+
+		source = source.asUGenInput;
+		destination = destination.asUGenInput;
+
+		source.isNil.if {"FluidBufCompose:  Invalid source buffer".throw};
+		destination.isNil.if {"FluidBufCompose:  Invalid destination buffer".throw};
+
+
+        ^this.multiNew('control', source, startFrame, numFrames, startChan, numChans, gain, destination, destStartFrame, destStartChan, destGain, doneAction);
+
+	}
+
+
+	*process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, gain = 1, destination, destStartFrame = 0, destStartChan = 0, destGain = 0, action|
+
+        var synth, instance;
 		source = source.asUGenInput;
 		destination = destination.asUGenInput;
 
@@ -8,12 +26,30 @@ FluidBufCompose{
 		destination.isNil.if {"FluidBufCompose:  Invalid destination buffer".throw};
 
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = {instance = FluidBufCompose.kr(source, startFrame, numFrames, startChan, numChans, gain, destination, destStartFrame, destStartChan, destGain, doneAction: Done.freeSelf)}.play(server);
 
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufCompose, source, startFrame, numFrames, startChan, numChans, gain, destination, destStartFrame, destStartChan, destGain);
+            synth.waitForFree;
+			server.sync;
+			destination = server.cachedBufferAt(destination);
+            destination.updateInfo;
             server.sync;
-			destination = server.cachedBufferAt(destination); destination.updateInfo; server.sync;
 			action.value(destination);
 		};
+
+        instance.server = server;
+        instance.synth = synth;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
+
+
 }

release-packaging/Classes/FluidBufHPSS.sc

@@ -1,5 +1,8 @@
-FluidBufHPSS{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, harmonic, percussive, residual, harmFilterSize = 17, percFilterSize = 31, maskingMode, harmThreshFreq1 = 0.1, harmThreshAmp1 = 0, harmThreshFreq2 = 0.5, harmThreshAmp2 = 0, percThreshFreq1 = 0.1, percThreshAmp1 = 0, percThreshFreq2 = 0.5, percThreshAmp2 = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufHPSS : UGen {
+
+    var <>server, <>synth;
+
+	*kr {|source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, harmonic, percussive, residual, harmFilterSize = 17, percFilterSize = 31, maskingMode = 0, harmThreshFreq1 = 0.1, harmThreshAmp1 = 0, harmThreshFreq2 = 0.5, harmThreshAmp2 = 0, percThreshFreq1 = 0.1, percThreshAmp1 = 0, percThreshFreq2 = 0.5, percThreshAmp2 = 0, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -8,23 +11,55 @@ FluidBufHPSS{
 		percussive = percussive.asUGenInput;
 		residual = residual.asUGenInput;
 
+		harmonic = harmonic ? -1;
+		percussive = percussive ? -1;
+		residual = residual ? -1;
+
+		//NB For wrapped versions of NRT classes, we set the params for maxima to
+		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+
+        ^this.multiNew('control', source, startFrame, numFrames, startChan, numChans, harmonic, percussive, residual, harmFilterSize, percFilterSize, maskingMode, harmThreshFreq1, harmThreshAmp1, harmThreshFreq2, harmThreshAmp2, percThreshFreq1, percThreshAmp1, percThreshFreq2, percThreshAmp2, windowSize, hopSize, fftSize, maxFFTSize, harmFilterSize, percFilterSize, doneAction);
+	}
+
+   *process {|server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, harmonic, percussive, residual, harmFilterSize = 17, percFilterSize = 31, maskingMode = 0, harmThreshFreq1 = 0.1, harmThreshAmp1 = 0, harmThreshFreq2 = 0.5, harmThreshAmp2 = 0, percThreshFreq1 = 0.1, percThreshAmp1 = 0, percThreshFreq2 = 0.5, percThreshAmp2 = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+
+        var synth, instance;
+
+		source = source.asUGenInput;
+		harmonic = harmonic.asUGenInput;
+		percussive = percussive.asUGenInput;
+		residual = residual.asUGenInput;
+
 		source.isNil.if {"FluidBufHPSS:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
 		harmonic = harmonic ? -1;
 		percussive = percussive ? -1;
 		residual = residual ? -1;
 
-		//NB For wrapped versions of NRT classes, we set the params for maxima to
-		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+        synth = { instance = FluidBufHPSS.kr(source, startFrame, numFrames, startChan, numChans, harmonic, percussive, residual, harmFilterSize, percFilterSize, maskingMode, harmThreshFreq1, harmThreshAmp1, harmThreshFreq2, harmThreshAmp2, percThreshFreq1, percThreshAmp1, percThreshFreq2, percThreshAmp2, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server);
 
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufHPSS, source, startFrame, numFrames, startChan, numChans, harmonic, percussive, residual, harmFilterSize, percFilterSize, maskingMode, harmThreshFreq1, harmThreshAmp1, harmThreshFreq2, harmThreshAmp2, percThreshFreq1, percThreshAmp1, percThreshFreq2, percThreshAmp2, windowSize, hopSize, fftSize, maxFFTSize, harmFilterSize, percFilterSize);
+			synth.waitForFree;
 			server.sync;
 			if (harmonic != -1) {harmonic = server.cachedBufferAt(harmonic); harmonic.updateInfo; server.sync;} {harmonic = nil};
 			if (percussive != -1) {percussive = server.cachedBufferAt(percussive); percussive.updateInfo; server.sync;} {percussive = nil};
 			if (residual != -1) {residual = server.cachedBufferAt(residual); residual.updateInfo; server.sync;} {residual = nil};
 			action.value(harmonic, percussive, residual);
 		};
+
+        instance.server = server;
+        instance.synth = synth;
+        ^instance;
 	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
+    }
+
 }

release-packaging/Classes/FluidBufLoudness.sc

@@ -1,5 +1,8 @@
-FluidBufLoudness{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  kWeighting = 1, truePeak = 1, windowSize = 1024, hopSize = 512, action;
+FluidBufLoudness : UGen{
+
+    var <>server, <>synth;
+
+    *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  kWeighting = 1, truePeak = 1, windowSize = 1024, hopSize = 512, doneAction = 0|
 
         var maxwindowSize = windowSize.nextPowerOfTwo;
 
@@ -9,13 +12,40 @@ FluidBufLoudness{
         source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
         features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
 
+        ^this.multiNew('control', source, startFrame, numFrames, startChan, numChans, features, kWeighting, truePeak, windowSize, hopSize, maxwindowSize, doneAction);
+    }
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  kWeighting = 1, truePeak = 1, windowSize = 1024, hopSize = 512, action|
+
+        var synth, instance;
+        source = source.asUGenInput;
+        features = features.asUGenInput;
+
+        source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
+        features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
+
         server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = {instance = FluidBufLoudness.kr(source, startFrame, numFrames, startChan, numChans, features, kWeighting, truePeak, windowSize, hopSize, doneAction:Done.freeSelf)}.play(server);
 
         forkIfNeeded{
-			server.sendMsg(\cmd, \BufLoudness, source, startFrame, numFrames, startChan, numChans, features, kWeighting, truePeak, windowSize, hopSize, maxwindowSize);
+            synth.waitForFree;
             server.sync;
             features = server.cachedBufferAt(features); features.updateInfo; server.sync;
             action.value(features);
         };
+
+        instance.server = server;
+        instance.synth = synth;
+        ^instance;
+    }
+
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufMFCC.sc

@@ -1,25 +1,51 @@
-FluidBufMFCC{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, numCoeffs = 13, numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufMFCC : UGen{
+    var <>server, <>synth;
+    *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, numCoeffs = 13, numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
         var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
-
         source = source.asUGenInput;
         features = features.asUGenInput;
 
         source.isNil.if {"FluidBufMFCC:  Invalid source buffer".throw};
         features.isNil.if {"FluidBufMFCC:  Invalid features buffer".throw};
 
-		server = server ? Server.default;
-
         //NB For wrapped versions of NRT classes, we set the params for maxima to
         //whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
         // same goes to maxNumCoeffs, which is passed numCoeffs in this case
 
+        ^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, features, numCoeffs, numBands, minFreq, maxFreq,  numCoeffs, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+    }
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features, numCoeffs = 13, numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+        var synth, instance;
+
+        source = source.asUGenInput;
+        features = features.asUGenInput;
+
+        source.isNil.if {"FluidBufMFCC:  Invalid source buffer".throw};
+        features.isNil.if {"FluidBufMFCC:  Invalid features buffer".throw};
+
+        server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = { instance = FluidBufMFCC.kr(source, startFrame, numFrames, startChan, numChans, features, numCoeffs, numBands, minFreq, maxFreq, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server);
+
         forkIfNeeded{
-			server.sendMsg(\cmd, \BufMFCC, source, startFrame, numFrames, startChan, numChans, features, numCoeffs, numBands, minFreq, maxFreq,  numCoeffs, windowSize, hopSize, fftSize, maxFFTSize);
+            synth.waitForFree;
             server.sync;
             features = server.cachedBufferAt(features); features.updateInfo; server.sync;
             action.value(features);
         };
+
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+    }
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufMelBands.sc

@@ -1,5 +1,7 @@
-FluidBufMelBands{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufMelBands : UGen {
+    var <>server, <>synth;
+
+		*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0 |
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -9,17 +11,44 @@ FluidBufMelBands{
 		source.isNil.if {"FluidBufMelBands:  Invalid source buffer".throw};
 		features.isNil.if {"FluidBufMelBands:  Invalid features buffer".throw};
 
-		server = server ? Server.default;
-
 		//NB For wrapped versions of NRT classes, we set the params for maxima to
 		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
 		// same for maxNumBands which is passed numBands
 
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, features, numBands, minFreq, maxFreq, numBands, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  numBands = 40, minFreq = 20, maxFreq = 20000, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+
+		var synth, instance;
+        source = source.asUGenInput;
+		features = features.asUGenInput;
+
+		source.isNil.if {"FluidBufMelBands:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufMelBands:  Invalid features buffer".throw};
+
+		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = { instance = FluidBufMelBands.kr(source, startFrame, numFrames, startChan, numChans, features, numBands, minFreq, maxFreq, windowSize, hopSize, fftSize, doneAction: Done.freeSelf)}.play(server);
+
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufMelBands, source, startFrame, numFrames, startChan, numChans, features, numBands, minFreq, maxFreq, numBands, windowSize, hopSize, fftSize, maxFFTSize);
+            synth.waitForFree;
 			server.sync;
 			features = server.cachedBufferAt(features); features.updateInfo; server.sync;
 			action.value(features);
 		};
+
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
+
 }

release-packaging/Classes/FluidBufNMF.sc

@@ -35,8 +35,12 @@ FluidBufNMF : UGen {
         destination = destination ? -1;
         bases = bases ? -1;
         activations = activations ? -1;
-        // this.server = server;
 
+		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
         synth = {instance = FluidBufNMF.kr(source, startFrame, numFrames, startChan, numChans, destination, bases, basesMode, activations, actMode, components,iterations, windowSize, hopSize, fftSize, doneAction: Done.freeSelf)}.play(server);
 
         forkIfNeeded{

release-packaging/Classes/FluidBufNoveltySlice.sc

@@ -1,6 +1,24 @@
-FluidBufNoveltySlice{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, feature = 0, kernelSize = 3, threshold = 0.5, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufNoveltySlice : UGen {
 
+    var <>synth, <>server;
+
+		*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, feature = 0, kernelSize = 3, threshold = 0.5, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0 |
+
+		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
+
+		source = source.asUGenInput;
+		indices = indices.asUGenInput;
+
+		source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
+
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, indices, feature, kernelSize, threshold, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize, doneAction);
+
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, feature = 0, kernelSize = 3, threshold = 0.5, filterSize = 1, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+
+        var synth, instance;
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
 		source = source.asUGenInput;
@@ -10,12 +28,27 @@ FluidBufNoveltySlice{
 		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
 
 		server = server ? Server.default;
+		server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+
+        synth = { instance = FluidBufNoveltySlice.kr(source, startFrame, numFrames, startChan, numChans, indices, feature, kernelSize, threshold, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize, doneAction: Done.freeSelf)}.play(server);
 
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufNoveltySlice, source, startFrame, numFrames, startChan, numChans, indices, feature, kernelSize, threshold, filterSize, windowSize, hopSize, fftSize, maxFFTSize, kernelSize, filterSize);
+			synth.waitForFree;
 			server.sync;
 			indices = server.cachedBufferAt(indices); indices.updateInfo; server.sync;
 			action.value(indices);
 		};
+
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+   cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufOnsetSlice.sc

@@ -1,5 +1,8 @@
-FluidBufOnsetSlice{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, metric = 0, threshold = 0.5, minSliceLength = 2, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufOnsetSlice : UGen {
+
+    var <>synth, <>server;
+
+    *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, metric = 0, threshold = 0.5, minSliceLength = 2, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -9,16 +12,44 @@ FluidBufOnsetSlice{
 		source.isNil.if {"FluidBufOnsetSlice:  Invalid source buffer".throw};
 		indices.isNil.if {"FluidBufOnsetSlice:  Invalid features buffer".throw};
 
-		server = server ? Server.default;
-
 		//NB For wrapped versions of NRT classes, we set the params for maxima to
 		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
 
+
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, indices, metric, threshold, minSliceLength, filterSize, frameDelta, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+
+	}
+
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, metric = 0, threshold = 0.5, minSliceLength = 2, filterSize = 5, frameDelta = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+        var synth, instance;
+		source = source.asUGenInput;
+		indices = indices.asUGenInput;
+
+		source.isNil.if {"FluidBufOnsetSlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufOnsetSlice:  Invalid features buffer".throw};
+
+		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+		//NB For wrapped versions of NRT classes, we set the params for maxima to
+		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+        synth = { instance = FluidBufOnsetSlice.kr(source, startFrame, numFrames, startChan, numChans, indices, metric, threshold, minSliceLength, filterSize, frameDelta, windowSize, hopSize, fftSize, doneAction: Done.freeSelf)}.play(server);
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufOnsetSlice, source, startFrame, numFrames, startChan, numChans, indices, metric, threshold, minSliceLength, filterSize, frameDelta, windowSize, hopSize, fftSize, maxFFTSize);
+            synth.waitForFree;
 			server.sync;
 			indices = server.cachedBufferAt(indices); indices.updateInfo; server.sync;
 			action.value(indices);
 		};
+        instance.server = server;
+        instance.synth = synth;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufPitch.sc

@@ -1,5 +1,7 @@
-FluidBufPitch{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  algorithm = 2, minFreq = 20, maxFreq = 10000, unit = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufPitch : UGen{
+    var <>synth, <>server;
+
+		*kr {|source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  algorithm = 2, minFreq = 20, maxFreq = 10000, unit = 0, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -9,16 +11,43 @@ FluidBufPitch{
 		source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
 		features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
 
-		server = server ? Server.default;
-
 		//NB For wrapped versions of NRT classes, we set the params for maxima to
 		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+        ^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, features, algorithm, minFreq, maxFreq, unit, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  algorithm = 2, minFreq = 20, maxFreq = 10000, unit = 0, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+
+		var synth,instance;
+
+		source = source.asUGenInput;
+		features = features.asUGenInput;
+
+		source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufPitch:  Invalid features buffer".throw};
+
+		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+
+        synth = { instance = FluidBufPitch.kr(source, startFrame, numFrames, startChan, numChans, features, algorithm, minFreq, maxFreq, unit, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server);
 
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufPitch, source, startFrame, numFrames, startChan, numChans, features, algorithm, minFreq, maxFreq, unit, windowSize, hopSize, fftSize, maxFFTSize);
+            synth.waitForFree;
 			server.sync;
 			features = server.cachedBufferAt(features); features.updateInfo; server.sync;
 			action.value(features);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufSines.sc

@@ -1,5 +1,8 @@
-FluidBufSines{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, sines, residual, bandwidth = 76, threshold = 0.7, minTrackLen = 15, magWeight = 0.1, freqWeight = 1, windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufSines : UGen{
+
+    var <>synth, <>server;
+
+    *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, sines, residual, bandwidth = 76, threshold = 0.7, minTrackLen = 15, magWeight = 0.1, freqWeight = 1, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -9,19 +12,46 @@ FluidBufSines{
 
 		source.isNil.if {"FluidBufSines:  Invalid source buffer".throw};
 
-		server = server ? Server.default;
 		sines = sines ? -1;
 		residual = residual ? -1;
 
 		//NB For wrapped versions of NRT classes, we set the params for maxima to
 		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
 
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, sines, residual, bandwidth, threshold, minTrackLen, magWeight, freqWeight, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+	}
+
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, sines, residual, bandwidth = 76, threshold = 0.7, minTrackLen = 15, magWeight = 0.1, freqWeight = 1, windowSize = 1024, hopSize = -1, fftSize = -1, action|
+        var synth, instance;
+		source = source.asUGenInput;
+		sines = sines.asUGenInput;
+		residual = residual.asUGenInput;
+
+		source.isNil.if {"FluidBufSines:  Invalid source buffer".throw};
+
+		server = server ? Server.default;
+         server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+		sines = sines ? -1;
+		residual = residual ? -1;
+        synth = { instance = FluidBufSines.kr(source, startFrame, numFrames, startChan, numChans, sines, residual, bandwidth, threshold, minTrackLen, magWeight, freqWeight, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server);
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufSines, source, startFrame, numFrames, startChan, numChans, sines, residual, bandwidth, threshold, minTrackLen, magWeight, freqWeight, windowSize, hopSize, fftSize, maxFFTSize);
+			synth.waitForFree;
 			server.sync;
 			if (sines != -1) {sines = server.cachedBufferAt(sines); sines.updateInfo; server.sync;} {sines = nil};
 			if (residual != -1) {residual = server.cachedBufferAt(residual); residual.updateInfo; server.sync;} {residual = nil};
 			action.value(sines, residual);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufSpectralShape.sc

@@ -1,5 +1,8 @@
-FluidBufSpectralShape{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  windowSize = 1024, hopSize = -1, fftSize = -1, action;
+FluidBufSpectralShape : UGen {
+
+    var <>synth, <>server;
+
+    *kr{ |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0|
 
 		var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize};
 
@@ -9,16 +12,44 @@ FluidBufSpectralShape{
 		source.isNil.if {"FluidBufSpectralShape:  Invalid source buffer".throw};
 		features.isNil.if {"FluidBufSpectralShape:  Invalid features buffer".throw};
 
+		//NB For wrapped versions of NRT classes, we set the params for maxima to
+		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
+
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, features, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, features,  windowSize = 1024, hopSize = -1, fftSize = -1, action|
+
+        var synth, instance;
+		source = source.asUGenInput;
+		features = features.asUGenInput;
+
+		source.isNil.if {"FluidBufSpectralShape:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufSpectralShape:  Invalid features buffer".throw};
+
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = { instance = FluidBufSpectralShape.kr(source, startFrame, numFrames, startChan, numChans, features, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server);
 
 		//NB For wrapped versions of NRT classes, we set the params for maxima to
 		//whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value)
-
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufSpectralShape, source, startFrame, numFrames, startChan, numChans, features, windowSize, hopSize, fftSize, maxFFTSize);
+            synth.waitForFree;
 			server.sync;
 			features = server.cachedBufferAt(features); features.updateInfo; server.sync;
 			action.value(features);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufStats.sc

@@ -1,6 +1,20 @@
-FluidBufStats{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, stats, numDerivs = 0, low = 0, middle = 50, high = 100, action;
+FluidBufStats : UGen{
+    var <>synth, <>server;
 
+	*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, stats, numDerivs = 0, low = 0, middle = 50, high = 100, doneAction=0|
+
+		source = source.asUGenInput;
+		stats = stats.asUGenInput;
+
+		source.isNil.if {"FluidBufStats:  Invalid source buffer".throw};
+		stats.isNil.if {"FluidBufStats:  Invalid stats buffer".throw};
+
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, stats, numDerivs, low, middle, high,doneAction);
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, stats, numDerivs = 0, low = 0, middle = 50, high = 100, action|
+
+        var synth, instance;
 		source = source.asUGenInput;
 		stats = stats.asUGenInput;
 
@@ -8,12 +22,25 @@ FluidBufStats{
 		stats.isNil.if {"FluidBufStats:  Invalid stats buffer".throw};
 
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
 
+        synth = { instance = FluidBufStats.kr(source, startFrame, numFrames, startChan, numChans, stats, numDerivs, low, middle, high, doneAction:Done.freeSelf)}.play(server);
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufStats, source, startFrame, numFrames, startChan, numChans, stats, numDerivs, low, middle, high);
+			synth.waitForFree;
 			server.sync;
 			stats = server.cachedBufferAt(stats); stats.updateInfo; server.sync;
 			action.value(stats);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufTransientSlice.sc

@@ -1,5 +1,7 @@
-FluidBufTransientSlice{
-		*process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, minSliceLength = 1000, action;
+FluidBufTransientSlice : UGen{
+    var <>synth, <>server;
+
+	*kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, minSliceLength = 1000, doneAction = 0|
 
 		source = source.asUGenInput;
 		indices = indices.asUGenInput;
@@ -7,13 +9,39 @@ FluidBufTransientSlice{
 		source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
 		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
 
+		^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, indices, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, minSliceLength, doneAction);
+
+	}
+
+    *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, indices, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, minSliceLength = 1000, action|
+
+        var synth, instance;
+		source = source.asUGenInput;
+		indices = indices.asUGenInput;
+
+		source.isNil.if {"FluidBufNoveltySlice:  Invalid source buffer".throw};
+		indices.isNil.if {"FluidBufNoveltySlice:  Invalid features buffer".throw};
+
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+        synth = {instance = FluidBufTransientSlice.kr(source, startFrame, numFrames, startChan, numChans, indices, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, minSliceLength, doneAction: Done.freeSelf)}.play(server);
 
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufTransientSlice, source, startFrame, numFrames, startChan, numChans, indices, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, minSliceLength);
+            synth.waitForFree;
 			server.sync;
 			indices = server.cachedBufferAt(indices); indices.updateInfo; server.sync;
 			action.value(indices);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

release-packaging/Classes/FluidBufTransients.sc

@@ -1,6 +1,25 @@
-FluidBufTransients {
-	 *process { arg server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, transients, residual, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, action;
+FluidBufTransients : UGen {
 
+    var <>synth, <>server;
+
+	 *kr { |source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, transients, residual, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, doneAction = 0 |
+
+		source = source.asUGenInput;
+		transients = transients.asUGenInput;
+		residual = residual.asUGenInput;
+
+		source.isNil.if {"FluidBufTransients:  Invalid source buffer".throw};
+
+        transients = transients ? -1;
+		residual = residual ? -1;
+
+        ^this.multiNew(\control, source, startFrame, numFrames, startChan, numChans, transients, residual, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, doneAction);
+
+	}
+
+	 *process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, numChans = -1, transients, residual, order = 20, blockSize = 256, padSize = 128, skew = 0, threshFwd = 2, threshBack = 1.1, windowSize = 14, clumpLength = 25, action|
+
+        var synth, instance;
 		source = source.asUGenInput;
 		transients = transients.asUGenInput;
 		residual = residual.asUGenInput;
@@ -8,15 +27,29 @@ FluidBufTransients {
 		source.isNil.if {"FluidBufTransients:  Invalid source buffer".throw};
 
 		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
         transients = transients ? -1;
 		residual = residual ? -1;
 
+        synth = {instance = FluidBufTransients.kr(source, startFrame, numFrames, startChan, numChans, transients, residual, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength, doneAction:Done.freeSelf)}.play(server);
+
 		forkIfNeeded{
-			server.sendMsg(\cmd, \BufTransients, source, startFrame, numFrames, startChan, numChans, transients, residual, order, blockSize, padSize, skew, threshFwd, threshBack, windowSize, clumpLength);
+            synth.waitForFree;
 			server.sync;
 			if (transients != -1) {transients = server.cachedBufferAt(transients); transients.updateInfo; server.sync;} {transients = nil};
 			if (residual != -1) {residual = server.cachedBufferAt(residual); residual.updateInfo; server.sync;} {residual = nil};
 			action.value(transients, residual);
 		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
     }
 }

src/FluidBufAmpSlice/FluidBufAmpSlice.cpp

@@ -11,5 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTAmpSlice>("BufAmpSlice", ft);
+  makeSCWrapper<NRTThreadedAmpSlice>("FluidBufAmpSlice", ft);
 }

src/FluidBufCompose/FluidBufCompose.cpp

@@ -10,5 +10,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<BufferComposeClient>("BufCompose", ft);
+  makeSCWrapper<NRTThreadedBufferCompose>("FluidBufCompose", ft);
 }

src/FluidBufHPSS/FluidBufHPSS.cpp

@@ -11,5 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTHPSS>("BufHPSS", ft);
+  makeSCWrapper<NRTThreadedHPSS>("FluidBufHPSS", ft);
 }

src/FluidBufLoudness/FluidBufLoudness.cpp

@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTLoudnessClient>("BufLoudness", ft);
+  makeSCWrapper<NRTThreadedLoudnessClient>("FluidBufLoudness", ft);
 }

src/FluidBufMFCC/FluidBufMFCC.cpp

@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTMFCCClient>("BufMFCC", ft);
+  makeSCWrapper<NRTThreadedMFCCClient>("FluidBufMFCC", ft);
 }

src/FluidBufMelBands/FluidBufMelBands.cpp

@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTMelBandsClient>("BufMelBands", ft);
+  makeSCWrapper<NRTThreadedMelBandsClient>("FluidBufMelBands", ft);
 }

src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp

@@ -10,5 +10,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTNoveltySlice>("BufNoveltySlice", ft);
+  makeSCWrapper<NRTThreadingNoveltySlice>("FluidBufNoveltySlice", ft);
 }

src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp

@@ -10,5 +10,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTOnsetSlice>("BufOnsetSlice", ft);
+  makeSCWrapper<NRTThreadingOnsetSlice>("FluidBufOnsetSlice", ft);
 }

src/FluidBufPitch/FluidBufPitch.cpp

@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTPitchClient>("BufPitch", ft);
+  makeSCWrapper<NRTThreadedPitchClient>("FluidBufPitch", ft);
 }

src/FluidBufSines/FluidBufSines.cpp

@@ -11,6 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTSines>("BufSines", ft);
-  
+  makeSCWrapper<NRTThreadedSines>("FluidBufSines", ft);
 }

src/FluidBufSpectralShape/FluidBufSpectralShape.cpp

@@ -10,5 +10,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTSpectralShapeClient>("BufSpectralShape", ft);
+  makeSCWrapper<NRTThreadedSpectralShapeClient>("FluidBufSpectralShape", ft);
 }

src/FluidBufStats/FluidBufStats.cpp

@@ -10,5 +10,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<BufferStats>("BufStats", ft);
+  makeSCWrapper<NRTThreadedBufferStats>("FluidBufStats", ft);
 }

src/FluidBufTransientSlice/FluidBufTransientSlice.cpp

@@ -10,5 +10,5 @@ static InterfaceTable* ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTTransientSlice>("BufTransientSlice", ft);
+  makeSCWrapper<NRTThreadedTransientSlice>("FluidBufTransientSlice", ft);
 }

src/FluidBufTransients/FluidBufTransients.cpp

@@ -9,5 +9,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTTransients>("BufTransients", ft);
+  makeSCWrapper<NRTThreadedTransients>("FluidBufTransients", ft);
 }