From 1d204f97b5879a6e70fc1be6f274381561c524cd Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Sun, 3 Mar 2019 23:20:01 +0000
Subject: [PATCH] Object stubs updated to new client / parameter relationship
 src/FluidBufCompose/FluidBufCompose.cpp src/FluidBufHPSS/FluidBufHPSS.cpp
 src/FluidBufNMF/FluidBufNMF.cpp
 src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
 src/FluidBufSines/FluidBufSines.cpp
 src/FluidBufTransients/FluidBufTransients.cpp
 src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
 src/FluidGain/FluidGain.cpp src/FluidHPSS/FluidHPSS.cpp
 src/FluidNMFMatch/FluidNMFMatch.cpp src/FluidSines/FluidSines.cpp
 src/FluidSTFTPass/FluidSTFTPass.cpp src/FluidTransients/FluidTransients.cpp
 src/FluidTransientSlice/FluidTransientSlice.cpp

---
 src/FluidBufCompose/FluidBufCompose.cpp       | 72 ++-----------------
 src/FluidBufHPSS/FluidBufHPSS.cpp             |  3 +-
 src/FluidBufNMF/FluidBufNMF.cpp               |  2 +-
 .../FluidBufNoveltySlice.cpp                  |  2 +-
 src/FluidBufSines/FluidBufSines.cpp           |  2 +-
 .../FluidBufTransientSlice.cpp                |  3 +-
 src/FluidBufTransients/FluidBufTransients.cpp |  2 +-
 src/FluidGain/FluidGain.cpp                   |  2 +-
 src/FluidHPSS/FluidHPSS.cpp                   |  2 +-
 src/FluidNMFMatch/FluidNMFMatch.cpp           |  2 +-
 src/FluidSTFTPass/FluidSTFTPass.cpp           |  2 +-
 src/FluidSines/FluidSines.cpp                 |  2 +-
 .../FluidTransientSlice.cpp                   |  2 +-
 src/FluidTransients/FluidTransients.cpp       |  5 +-
 14 files changed, 19 insertions(+), 84 deletions(-)

diff --git a/src/FluidBufCompose/FluidBufCompose.cpp b/src/FluidBufCompose/FluidBufCompose.cpp
index 8016fc3..316ecff 100644
--- a/src/FluidBufCompose/FluidBufCompose.cpp
+++ b/src/FluidBufCompose/FluidBufCompose.cpp
@@ -1,74 +1,14 @@
-  // FD_BufNMF, an NRT buffer NMF Processor
 // 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/BufferComposeNRT.hpp"
-#include "fdNRTBase.hpp"
-#include "data/FluidTensor.hpp"
-#include "clients/common/FluidParams.hpp"
-#include "SC_PlugIn.h"
-#include <unordered_set>
-#include <vector>
+#include <clients/nrt/BufferComposeNRT.hpp>
+#include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
 
-namespace fluid {
-  namespace wrapper{
-    
-    class BufCompose: public NRTCommandBase
-    {
-    public:
-      using client_type =  client::BufferComposeClient;
-      using NRTCommandBase::NRTCommandBase;
-      
-      ~BufCompose() {}
-      
-      void runCommand(World* world, void* replyAddr, char* completionMsgData, size_t completionMsgSize)
-      {
-        cmd<BufCompose, &BufCompose::process, &BufCompose::postProcess, &BufCompose::postComplete>(world, "/BufCompose", replyAddr,  completionMsgData, completionMsgSize);
-      }
-      
-      bool process(World* world)
-      {
-        //sanity check the parameters
-        bool parametersOk;
-        client_type::ProcessModel processModel;
-        std::string whatHappened;//this will give us a message to pass back if param check fails
-        std::tie(parametersOk,whatHappened,processModel) = bufferCompose.sanityCheck();
-        if(!parametersOk)
-        {
-          Print("fdCompose: %s \n", whatHappened.c_str());
-          return false;
-        }
-        bufferCompose.process(processModel);
-        mModel = processModel;
-        return true;
-      }
-
-      bool postProcess(World* world)
-      {
-        static_cast<SCBufferView*>(mModel.dst)->assignToRT(world);
-        return true;
-      }
-      
-      bool postComplete(World* w) {
-        static_cast<SCBufferView*>(mModel.dst)->cleanUp();        
-        return true;
-      }
-      
-      std::vector<client::Instance>& parameters()
-      {
-        return bufferCompose.getParams(); 
-      }
-    private:
-      client_type bufferCompose;
-      client_type::ProcessModel mModel;
-    };//class
-  } //namespace wrapper
-}//namespace fluid
-
-
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
-  registerCommand<fluid::wrapper::BufCompose,fluid:: client::BufferComposeClient>(ft, "BufCompose");
-  fluid::wrapper::printCmd<fluid::client::BufferComposeClient>(ft,"BufCompose","FDCompose");
+  using namespace fluid::client;
+  makeSCWrapper<BufferComposeClient, float,float>("BufCompose", BufComposeParams, ft); 
+//  registerCommand<fluid::wrapper::BufCompose,fluid:: client::BufferComposeClient>(ft, "BufCompose");
+//  fluid::wrapper::printCmd<fluid::client::BufferComposeClient>(ft,"BufCompose","FDCompose");
 }
diff --git a/src/FluidBufHPSS/FluidBufHPSS.cpp b/src/FluidBufHPSS/FluidBufHPSS.cpp
index bc979c0..8737d38 100644
--- a/src/FluidBufHPSS/FluidBufHPSS.cpp
+++ b/src/FluidBufHPSS/FluidBufHPSS.cpp
@@ -2,7 +2,6 @@
 // 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/rt/HPSSClient.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTStreamAdaptor<HPSSClient<double,float>>>(ft, "BufHPSS");
+  makeSCWrapper<NRTHPSS,double,float>("BufHPSS",NRTHPSSParams,ft);
 }
diff --git a/src/FluidBufNMF/FluidBufNMF.cpp b/src/FluidBufNMF/FluidBufNMF.cpp
index 2e75538..abd323d 100644
--- a/src/FluidBufNMF/FluidBufNMF.cpp
+++ b/src/FluidBufNMF/FluidBufNMF.cpp
@@ -6,5 +6,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFClient>(ft, "BufNMF");
+  makeSCWrapper<NMFClient,double,float>("BufNMF",NMFParams, ft);
 }
diff --git a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
index 206b5e2..8f0d64e 100644
--- a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
+++ b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
@@ -10,5 +10,5 @@ static InterfaceTable* ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NoveltyClient>(ft, "BufNoveltySlice");
+  makeSCWrapper<NoveltyClient,double,float>("BufNoveltySlice",NoveltyParams,ft);
 }
diff --git a/src/FluidBufSines/FluidBufSines.cpp b/src/FluidBufSines/FluidBufSines.cpp
index abd82fd..2368551 100644
--- a/src/FluidBufSines/FluidBufSines.cpp
+++ b/src/FluidBufSines/FluidBufSines.cpp
@@ -10,6 +10,6 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTStreamAdaptor<SinesClient<double,float>>>(ft, "BufSines");
+  makeSCWrapper<NRTSines,double,float>("BufSines",NRTSineParams,ft);
   
 }
diff --git a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
index 3e0db18..68fade3 100644
--- a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
+++ b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
@@ -10,6 +10,5 @@ static InterfaceTable* ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTSliceAdaptor<TransientsSlice<double,float>>>(ft, "BufTransientSlice");
-  
+  makeSCWrapper<NRTTransientSlice,double,float>("BufTransientSlice",NRTTransientSliceParams, ft);
 }
diff --git a/src/FluidBufTransients/FluidBufTransients.cpp b/src/FluidBufTransients/FluidBufTransients.cpp
index 1b2ae80..3102005 100644
--- a/src/FluidBufTransients/FluidBufTransients.cpp
+++ b/src/FluidBufTransients/FluidBufTransients.cpp
@@ -7,5 +7,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTStreamAdaptor<TransientClient<double,float>>>(ft,"BufTransients");
+  makeSCWrapper<NRTTransients,double,float>("BufTransients",NRTTransientParams,ft);
 }
diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp
index 64a04a1..fa40308 100644
--- a/src/FluidGain/FluidGain.cpp
+++ b/src/FluidGain/FluidGain.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidGainUgen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<GainClient<double,float>>(ft, "FluidGain");
+  makeSCWrapper<GainClient,double,float>("FluidGain", GainParams,ft);
 }
diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp
index 1b779e5..72ab11b 100644
--- a/src/FluidHPSS/FluidHPSS.cpp
+++ b/src/FluidHPSS/FluidHPSS.cpp
@@ -8,7 +8,7 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<HPSSClient<double,float>>(ft, "FluidHPSS");  
+  makeSCWrapper<HPSSClient,double,float>("FluidHPSS",HPSSParams,ft);  
 }
 
 
diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp
index 6eec74e..ae854a4 100644
--- a/src/FluidNMFMatch/FluidNMFMatch.cpp
+++ b/src/FluidNMFMatch/FluidNMFMatch.cpp
@@ -9,7 +9,7 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFMatch<double, float>>(ft, "FluidNMFMatch");
+  makeSCWrapper<NMFMatch,double, float>("FluidNMFMatch",NMFMatchParams,ft);
 }
 
 
diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp
index 681e7c5..b1c15dd 100644
--- a/src/FluidSTFTPass/FluidSTFTPass.cpp
+++ b/src/FluidSTFTPass/FluidSTFTPass.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
     ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<BaseSTFTClient<double,float>>(ft, "FluidSTFTPass");
+  makeSCWrapper<BaseSTFTClient,double,float>("FluidSTFTPass",STFTParams,ft);
 }
diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp
index bc268f5..eab70a4 100644
--- a/src/FluidSines/FluidSines.cpp
+++ b/src/FluidSines/FluidSines.cpp
@@ -9,6 +9,6 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<SinesClient<double,float>>(ft, "FluidSines");
+  makeSCWrapper<SinesClient,double,float>("FluidSines",SinesParams,ft);
 }
 
diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp
index 8058b57..fd138c9 100644
--- a/src/FluidTransientSlice/FluidTransientSlice.cpp
+++ b/src/FluidTransientSlice/FluidTransientSlice.cpp
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<TransientsSlice<double,float>>(ft, "FluidTransientSlice");
+  makeSCWrapper<TransientsSlice,double,float>("FluidTransientSlice",TransientParams,ft);
 }
diff --git a/src/FluidTransients/FluidTransients.cpp b/src/FluidTransients/FluidTransients.cpp
index 708fe64..55de31d 100644
--- a/src/FluidTransients/FluidTransients.cpp
+++ b/src/FluidTransients/FluidTransients.cpp
@@ -1,16 +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/rt/TransientClient.hpp>
-
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
 
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
-//  registerUnit<fluid::wrapper::FluidTransients>(ft, "FluidTransients");
   using namespace fluid::client;
-  makeSCWrapper<TransientClient<double,float>>(ft, "FluidTransients");
+  makeSCWrapper<TransientClient, double, float>("FluidTransients", TransientParams, ft);
 }