From 1be9076bbe5f6fc0f1f61a9a528e1c11609627a7 Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Mon, 9 Sep 2019 13:45:33 +0100
Subject: [PATCH] Thread demo client

---
 .../Classes/FluidBufThreadDemo.sc             | 50 +++++++++++++++++++
 src/FluidBufThreadDemo/CMakeLists.txt         | 20 ++++++++
 src/FluidBufThreadDemo/FluidBufThreadDemo.cpp | 13 +++++
 3 files changed, 83 insertions(+)
 create mode 100644 release-packaging/Classes/FluidBufThreadDemo.sc
 create mode 100644 src/FluidBufThreadDemo/CMakeLists.txt
 create mode 100644 src/FluidBufThreadDemo/FluidBufThreadDemo.cpp

diff --git a/release-packaging/Classes/FluidBufThreadDemo.sc b/release-packaging/Classes/FluidBufThreadDemo.sc
new file mode 100644
index 0000000..ddab3c5
--- /dev/null
+++ b/release-packaging/Classes/FluidBufThreadDemo.sc
@@ -0,0 +1,50 @@
+FluidBufThreadDemo : 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};
+
+		source = source.asUGenInput;
+		features = features.asUGenInput;
+
+		source.isNil.if {"FluidBufPitch:  Invalid source buffer".throw};
+		features.isNil.if {"FluidBufPitch:  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, algorithm, minFreq, maxFreq, unit, windowSize, hopSize, fftSize, maxFFTSize, doneAction);
+	}
+
+    *process { |server, result, time, action|
+
+		var synth,instance;
+
+		result = result.asUGenInput;
+
+		result.isNil.if {"FluidBufThreadDemo:  Invalid source buffer".throw};
+
+		server = server ? Server.default;
+        server.ifNotRunning({
+            "WARNING: Server not running".postln;
+            ^nil;
+        });
+
+        synth = { instance = FluidBufPitch.kr(result, time, doneAction:Done.freeSelf)}.play(server);
+
+		forkIfNeeded{
+            synth.waitForFree;
+			server.sync;
+			result = server.cachedBufferAt(result); result.updateInfo; server.sync;
+			action.value(result);
+		};
+        instance.synth = synth;
+        instance.server = server;
+        ^instance;
+	}
+
+    cancel{
+        if(this.server.notNil)
+        {this.server.sendMsg("/u_cmd", this.synth.nodeID, this.synthIndex, "cancel")};
+    }
+}
diff --git a/src/FluidBufThreadDemo/CMakeLists.txt b/src/FluidBufThreadDemo/CMakeLists.txt
new file mode 100644
index 0000000..3693881
--- /dev/null
+++ b/src/FluidBufThreadDemo/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.3)
+get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE)
+message("Configuring ${PLUGIN}")
+set(FILENAME ${PLUGIN}.cpp)
+
+add_library(
+  ${PLUGIN}
+  MODULE
+  ${FILENAME}
+)
+
+target_include_directories(
+  ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include
+)
+
+target_link_libraries(
+  ${PLUGIN} PRIVATE FLUID_DECOMPOSITION
+)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)
diff --git a/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp b/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp
new file mode 100644
index 0000000..ae810f3
--- /dev/null
+++ b/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp
@@ -0,0 +1,13 @@
+
+// A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899)
+
+#include <clients/nrt/FluidThreadTest.hpp>
+#include <FluidSCWrapper.hpp>
+
+static InterfaceTable *ft;
+
+PluginLoad(OfflineFluidDecompositionUGens) {
+  ft = inTable;
+  using namespace fluid::client;
+  makeSCWrapper<NRTThreadedThreadTest>("FluidBufThreadDemo", ft);
+}