diff --git a/release-packaging/Classes/FluidDataSet.sc b/release-packaging/Classes/FluidDataSet.sc index 6d1dea1..cccfdd7 100644 --- a/release-packaging/Classes/FluidDataSet.sc +++ b/release-packaging/Classes/FluidDataSet.sc @@ -48,18 +48,15 @@ FluidDataSet : FluidManipulationClient { } addPoint{|label, buffer, action| - buffer = this.prEncodeBuffer(buffer); - this.prSendMsg(\addPoint,[label.asSymbol,buffer],action); + this.prSendMsg(\addPoint,[label.asSymbol,buffer.asUGenInput],action); } getPoint{|label, buffer, action| - buffer = this.prEncodeBuffer(buffer); - this.prSendMsg(\getPoint,[label.asSymbol,buffer],action,outputBuffers:[buffer]); + this.prSendMsg(\getPoint,[label.asSymbol,buffer.asUGenInput],action); } updatePoint{|label, buffer, action| - buffer = this.prEncodeBuffer(buffer); - this.prSendMsg(\updatePoint,[label.asSymbol,buffer],action,outputBuffers:[buffer]); + this.prSendMsg(\updatePoint,[label.asSymbol,buffer.asUGenInput],action); } deletePoint{|label, action| diff --git a/release-packaging/Classes/FluidKMeans.sc b/release-packaging/Classes/FluidKMeans.sc index da2a5ed..fba3e2d 100644 --- a/release-packaging/Classes/FluidKMeans.sc +++ b/release-packaging/Classes/FluidKMeans.sc @@ -26,10 +26,9 @@ FluidKMeans : FluidRTDataClient { } predictPoint { |buffer, action| - buffer = this.prEncodeBuffer(buffer); this.prSendMsg(\predictPoint, - [buffer], action, - [number(FluidMessageResponse,_,_)],outputBuffers:[buffer] + [buffer.asUGenInput], action, + [number(FluidMessageResponse,_,_)] ); } } diff --git a/release-packaging/Classes/FluidKNNClassifier.sc b/release-packaging/Classes/FluidKNNClassifier.sc index 8d845b8..89e54d8 100644 --- a/release-packaging/Classes/FluidKNNClassifier.sc +++ b/release-packaging/Classes/FluidKNNClassifier.sc @@ -15,10 +15,9 @@ FluidKNNClassifier : FluidRTDataClient { } predictPoint {|buffer, action| - buffer = this.prEncodeBuffer(buffer); this.prSendMsg(\predictPoint, [buffer.asUGenInput], action, - [string(FluidMessageResponse,_,_)],outputBuffers:[buffer] + [string(FluidMessageResponse,_,_)] ); } } diff --git a/release-packaging/Classes/FluidKNNRegressor.sc b/release-packaging/Classes/FluidKNNRegressor.sc index c4fd6d4..befb11d 100644 --- a/release-packaging/Classes/FluidKNNRegressor.sc +++ b/release-packaging/Classes/FluidKNNRegressor.sc @@ -18,8 +18,7 @@ FluidKNNRegressor : FluidRTDataClient { } predictPoint { |buffer, action| - buffer = this.prEncodeBuffer(buffer); - this.prSendMsg(\predictPoint, [buffer], action, - [number(FluidMessageResponse,_,_)],outputBuffers:[buffer]); + this.prSendMsg(\predictPoint, [buffer.asUGenInput], action, + [number(FluidMessageResponse,_,_)]); } } diff --git a/release-packaging/Classes/FluidMLP.sc b/release-packaging/Classes/FluidMLP.sc index 16a262b..a981e5b 100644 --- a/release-packaging/Classes/FluidMLP.sc +++ b/release-packaging/Classes/FluidMLP.sc @@ -44,10 +44,8 @@ FluidMLPRegressor : FluidRTDataClient { } predictPoint { |sourceBuffer, targetBuffer, action| - sourceBuffer = this.prEncodeBuffer(sourceBuffer); - targetBuffer = this.prEncodeBuffer(targetBuffer); this.prSendMsg(\predictPoint, - [sourceBuffer.asUGenInput, targetBuffer.asUGenInput], action,outputBuffers:[targetBuffer]); + [sourceBuffer.asUGenInput, targetBuffer.asUGenInput], action); } } @@ -96,8 +94,7 @@ FluidMLPClassifier : FluidRTDataClient { } predictPoint { |sourceBuffer, action| - sourceBuffer = this.prEncodeBuffer(sourceBuffer); this.prSendMsg(\predictPoint, - [sourceBuffer], action, string(FluidMessageResponse,_,_)); + [sourceBuffer.asUGenInput], action, string(FluidMessageResponse,_,_)); } } diff --git a/release-packaging/Classes/FluidManipulationClient.sc b/release-packaging/Classes/FluidManipulationClient.sc index 82ee858..5449e07 100644 --- a/release-packaging/Classes/FluidManipulationClient.sc +++ b/release-packaging/Classes/FluidManipulationClient.sc @@ -116,9 +116,7 @@ FluidManipulationClient { this.prSendMsg(\size,[],action,[numbers(FluidMessageResponse,_,1,_)]); } - prEncodeBuffer { |buf| buf !? {^buf.asUGenInput} ?? {^-1} } - - prSendMsg { |msg, args, action,parser,outputBuffers| + prSendMsg { |msg, args, action,parser| if(this.server.serverRunning.not,{(this.asString + "– server not running").error; ^nil}); forkIfNeeded{ synth ?? {onSynthFree.value; server.sync}; @@ -127,16 +125,7 @@ FluidManipulationClient { defer{ var result; result = FluidMessageResponse.collectArgs(parser,msg.drop(3)); - if(outputBuffers.notNil) { - forkIfNeeded { - outputBuffers.collectInPlace{ |b| - server.cachedBufferAt(b) !? {|x| x.updateInfo} - }; - server.sync; - if(action.notNil){action.value(*(outputBuffers++result))}{action.value}; - }; - } - {if(action.notNil){action.value(result)}{action.value};} + if(action.notNil){action.value(result)}{action.value}; } },'/'++msg, server.addr, nil,[synth.nodeID]).oneShot; server.listSendMsg(['/u_cmd', synth.nodeID, ugen.synthIndex, msg].addAll(args)); diff --git a/release-packaging/Classes/FluidNormalize.sc b/release-packaging/Classes/FluidNormalize.sc index 8881930..2962d5d 100644 --- a/release-packaging/Classes/FluidNormalize.sc +++ b/release-packaging/Classes/FluidNormalize.sc @@ -21,11 +21,8 @@ FluidNormalize : FluidRTDataClient { } transformPoint{|sourceBuffer, destBuffer, action| - sourceBuffer = this.prEncodeBuffer(sourceBuffer); - destBuffer = this.prEncodeBuffer(destBuffer); this.prSendMsg(\transformPoint, - [sourceBuffer, destBuffer], action, - outputBuffers:[destBuffer] + [sourceBuffer.asUGenInput, destBuffer.asUGenInput], action ); } } diff --git a/release-packaging/Classes/FluidPCA.sc b/release-packaging/Classes/FluidPCA.sc index 899d6e0..45dcd47 100644 --- a/release-packaging/Classes/FluidPCA.sc +++ b/release-packaging/Classes/FluidPCA.sc @@ -17,8 +17,6 @@ FluidPCA : FluidRTDataClient { } transformPoint{|sourceBuffer, destBuffer, action| - sourceBuffer = this.prEncodeBuffer(sourceBuffer); - destBuffer = this.prEncodeBuffer(destBuffer); - this.prSendMsg(\transformPoint,[sourceBuffer, destBuffer], action, outputBuffers:[destBuffer]); + this.prSendMsg(\transformPoint,[sourceBuffer.asUGenInput, destBuffer.asUGenInput], action); } } diff --git a/release-packaging/Classes/FluidStandardize.sc b/release-packaging/Classes/FluidStandardize.sc index a01c643..010c2ef 100644 --- a/release-packaging/Classes/FluidStandardize.sc +++ b/release-packaging/Classes/FluidStandardize.sc @@ -20,10 +20,8 @@ FluidStandardize : FluidRTDataClient { } transformPoint{|sourceBuffer, destBuffer, action| - sourceBuffer = this.prEncodeBuffer(sourceBuffer); - destBuffer = this.prEncodeBuffer(destBuffer); this.prSendMsg(\transformPoint, - [sourceBuffer, destBuffer], action, outputBuffers:[destBuffer] + [sourceBuffer.asUGenInput, destBuffer.asUGenInput], action ); } }