From 7d6a86dbf7fb524c05e0b7e2b19b4ad8f863e4c6 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Fri, 8 May 2020 15:33:34 +0100 Subject: [PATCH 1/3] Ensure message results from synchronous jobs get properly passed on --- include/FluidSCWrapper.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/FluidSCWrapper.hpp b/include/FluidSCWrapper.hpp index 0b1ba03..0df8bc3 100644 --- a/include/FluidSCWrapper.hpp +++ b/include/FluidSCWrapper.hpp @@ -291,7 +291,7 @@ public: } w->mClient.setSynchronous(w->mSynchronous); w->mClient.enqueue(w->mParams); - w->mClient.process(); + w->mResult = w->mClient.process(); } /// Check result and report if bad @@ -301,6 +301,8 @@ public: Result r; ProcessState s = w->mClient.checkProgress(r); + if(w->mSynchronous) r = w->mResult; + if ((s == ProcessState::kDone || s == ProcessState::kDoneStillProcessing) || (w->mSynchronous && s == ProcessState::kNoProcess)) // I think this hinges on the fact that @@ -431,6 +433,7 @@ protected: bool mQueueEnabled{false}; bool mCheckingForDone{false}; // only write to this from RT thread kthx bool mCancelled{false}; + Result mResult; }; //////////////////////////////////////////////////////////////////////////////// From 97d8250cb95fae186b859bf3c99d87f553a97be1 Mon Sep 17 00:00:00 2001 From: Francesco Cameli Date: Mon, 22 Jun 2020 19:35:43 +0100 Subject: [PATCH 2/3] fix FluidNRTProcess server dispatch --- release-packaging/Classes/FluidNRTProcess.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-packaging/Classes/FluidNRTProcess.sc b/release-packaging/Classes/FluidNRTProcess.sc index 35e8ce4..5a7e009 100644 --- a/release-packaging/Classes/FluidNRTProcess.sc +++ b/release-packaging/Classes/FluidNRTProcess.sc @@ -42,7 +42,7 @@ FluidNRTProcess : Object{ c.test = true; c.signal; } - },'/done',argTemplate:[synth.nodeID]).oneShot; + },'/done', srcID:server.addr, argTemplate:[synth.nodeID]).oneShot; forkIfNeeded{ c.wait; From 28b0537f9118deb63c8023dcdcc7ecc797032726 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 23 Jun 2020 00:20:39 +0100 Subject: [PATCH 3/3] Add Test build type --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26c76fb..912c081 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ if(NOT flucoma-core_POPULATED) add_subdirectory(${flucoma-core_SOURCE_DIR} ${flucoma-core_BINARY_DIR}) include(flucoma_version) include(flucoma-buildtools) + include(flucoma-buildtype) endif() set_if_toplevel(VAR CMAKE_LIBRARY_OUTPUT_DIRECTORY