Merge branch 'clients/inter_client_comms' into feature/bufselect

release-packaging/Classes/FluidBufSTFT.sc

@@ -0,0 +1,47 @@
+FluidBufSTFT : FluidBufProcessor {
+
+    *kr  { |source, startFrame = 0, numFrames = -1, startChan = 0, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse = 0,windowSize = 1024, hopSize = -1, fftSize = -1, trig = 1, blocking = 1|
+        
+        // source = source.asUGenInput;
+
+        // source.isNil.if {"FluidBufScale:  Invalid source buffer".throw};
+        source = source ? -1; 
+        magnitudeBuffer = magnitudeBuffer ? -1;     
+        phaseBuffer = phaseBuffer ? -1; 
+        resynthesisBuffer = resynthesisBuffer ? - 1;     
+        
+        ^FluidProxyUgen.kr(\FluidBufSTFTTrigger, -1, source, startFrame, numFrames, startChan, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse, windowSize, hopSize, fftSize,trig, blocking);
+	}
+
+	*process { |server, source, startFrame = 0, numFrames = -1, startChan = 0, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse = 0, windowSize = 1024, hopSize = -1, fftSize = -1,freeWhenDone = true, action|
+        
+        // source = source.asUGenInput;
+
+        // source.isNil.if {"FluidBufSTFT:  Invalid source buffer".throw};
+        source = source ? -1; 
+        magnitudeBuffer = magnitudeBuffer ? -1;     
+        phaseBuffer = phaseBuffer ? -1; 
+        resynthesisBuffer = resynthesisBuffer ? - 1;     
+        
+	    ^this.new(
+            server, nil, [magnitudeBuffer,phaseBuffer,resynthesisBuffer].select{|b| b != -1}
+		).processList(
+			[source, startFrame, numFrames, startChan, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse, windowSize, hopSize, fftSize, 0], freeWhenDone, action
+		);
+	}
+
+    *processBlocking { |server, source, startFrame = 0, numFrames = -1, startChan = 0, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse = 0, windowSize = 1024, hopSize = -1, fftSize = -1,freeWhenDone = true, action|
+        
+        // source = source.asUGenInput;
+        source = source ? -1; 
+        magnitudeBuffer = magnitudeBuffer ? -1;     
+        phaseBuffer = phaseBuffer ? -1; 
+        resynthesisBuffer = resynthesisBuffer ? - 1; 
+        
+	    ^this.new(
+            server, nil, [magnitudeBuffer,phaseBuffer,resynthesisBuffer].select{|b| b != -1}
+		).processList(
+			[source, startFrame, numFrames, startChan, magnitudeBuffer, phaseBuffer, resynthesisBuffer, inverse, windowSize, hopSize, fftSize,1], freeWhenDone, action
+		);
+	}
+}

release-packaging/HelpSource/Classes/FluidBufSTFT.schelp

@@ -0,0 +1,154 @@
+TITLE:: FluidBufSTFT
+summary:: (put short description here)
+categories:: Undocumented classes, UGens>Undocumented
+related:: Classes/SomeRelatedClass, Reference/SomeRelatedStuff, etc.
+
+DESCRIPTION::
+(put long description here)
+
+CLASSMETHODS::
+
+METHOD:: processBlocking
+(describe method here)
+
+ARGUMENT:: server
+(describe argument here)
+
+ARGUMENT:: source
+(describe argument here)
+
+ARGUMENT:: startFrame
+(describe argument here)
+
+ARGUMENT:: numFrames
+(describe argument here)
+
+ARGUMENT:: startChan
+(describe argument here)
+
+ARGUMENT:: magnitudeBuffer
+(describe argument here)
+
+ARGUMENT:: phaseBuffer
+(describe argument here)
+
+ARGUMENT:: resynthesisBuffer
+(describe argument here)
+
+ARGUMENT:: inverse
+(describe argument here)
+
+ARGUMENT:: freeWhenDone
+(describe argument here)
+
+ARGUMENT:: action
+(describe argument here)
+
+returns:: (describe returnvalue here)
+
+METHOD:: process
+(describe method here)
+
+ARGUMENT:: server
+(describe argument here)
+
+ARGUMENT:: source
+(describe argument here)
+
+ARGUMENT:: startFrame
+(describe argument here)
+
+ARGUMENT:: numFrames
+(describe argument here)
+
+ARGUMENT:: startChan
+(describe argument here)
+
+ARGUMENT:: magnitudeBuffer
+(describe argument here)
+
+ARGUMENT:: phaseBuffer
+(describe argument here)
+
+ARGUMENT:: resynthesisBuffer
+(describe argument here)
+
+ARGUMENT:: inverse
+(describe argument here)
+
+ARGUMENT:: freeWhenDone
+(describe argument here)
+
+ARGUMENT:: action
+(describe argument here)
+
+returns:: (describe returnvalue here)
+
+METHOD:: kr
+(describe method here)
+
+ARGUMENT:: source
+(describe argument here)
+
+ARGUMENT:: startFrame
+(describe argument here)
+
+ARGUMENT:: numFrames
+(describe argument here)
+
+ARGUMENT:: startChan
+(describe argument here)
+
+ARGUMENT:: magnitudeBuffer
+(describe argument here)
+
+ARGUMENT:: phaseBuffer
+(describe argument here)
+
+ARGUMENT:: resynthesisBuffer
+(describe argument here)
+
+ARGUMENT:: inverse
+(describe argument here)
+
+ARGUMENT:: trig
+(describe argument here)
+
+ARGUMENT:: blocking
+(describe argument here)
+
+returns:: (describe returnvalue here)
+
+
+INSTANCEMETHODS::
+
+
+EXAMPLES::
+
+code::
+s.reboot
+(
+b = Buffer.read(s,File.realpath(FluidBufSTFT.class.filenameSymbol).dirname.withTrailingSlash ++ "../AudioFiles/Tremblay-AaS-AcousticStrums-M.wav");
+m = Buffer.new;
+p = Buffer.new;
+r = Buffer.new;
+)
+b
+(
+fork{
+    FluidBufSTFT.process(s,source:b,magnitudeBuffer:m,phaseBuffer:p).wait;
+    FluidBufSTFT.process(s,magnitudeBuffer:m,phaseBuffer:p,resynthesisBuffer:r,inverse:1).wait;
+    "Done".postln;
+}
+)
+
+
+{ PlayBuf.ar(1,r);   }.play
+
+//null?
+{ PlayBuf.ar(1,r) - PlayBuf(1,b);   }.play
+
+
+
+
+::

src/FluidBufSTFT/CMakeLists.txt

@@ -0,0 +1,21 @@
+# Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
+# Copyright 2017-2019 University of Huddersfield.
+# Licensed under the BSD-3 License.
+# See license.md file in the project root for full license information.
+# This project has received funding from the European Research Council (ERC)
+# under the European Union’s Horizon 2020 research and innovation programme
+# (grant agreement No 725899).
+
+cmake_minimum_required(VERSION 3.11)
+
+get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE)
+message("Configuring ${PLUGIN}")
+set(FILENAME ${PLUGIN}.cpp)
+
+add_library(
+  ${PLUGIN}
+  MODULE
+  ${FILENAME}
+)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)

src/FluidBufSTFT/FluidBufSTFT.cpp

@@ -0,0 +1,22 @@
+/*
+Part of the Fluid Corpus Manipulation Project (http://www.flucoma.org/)
+Copyright 2017-2019 University of Huddersfield.
+Licensed under the BSD-3 License.
+See license.md file in the project root for full license information.
+This project has received funding from the European Research Council (ERC)
+under the European Union’s Horizon 2020 research and innovation programme
+(grant agreement No 725899).
+*/
+
+#include <clients/nrt/BufSTFTClient.hpp>
+
+#include <FluidSCWrapper.hpp>
+
+static InterfaceTable *ft;
+
+PluginLoad(OfflineFluidDecompositionUGens)
+{
+  ft = inTable;
+  using namespace fluid::client;
+  makeSCWrapper<NRTThreadedBufferSTFTClient>("FluidBufSTFT", ft);
+}