From abdedc452258cd4e636fbad9ac8d304ec9e103bb Mon Sep 17 00:00:00 2001
From: Gerard <g.roma@hud.ac.uk>
Date: Tue, 12 Nov 2019 14:11:17 +0000
Subject: [PATCH] adapt to client name changes from refactoring of
 fluid_decomposition

---
 src/FluidAmpSlice/FluidAmpSlice.cpp                   | 4 ++--
 src/FluidBufAmpSlice/FluidBufAmpSlice.cpp             | 4 ++--
 src/FluidBufCompose/FluidBufCompose.cpp               | 4 ++--
 src/FluidBufHPSS/FluidBufHPSS.cpp                     | 2 +-
 src/FluidBufNMF/FluidBufNMF.cpp                       | 2 +-
 src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp     | 5 ++---
 src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp         | 5 ++---
 src/FluidBufSines/FluidBufSines.cpp                   | 3 +--
 src/FluidBufSpectralShape/FluidBufSpectralShape.cpp   | 1 -
 src/FluidBufStats/FluidBufStats.cpp                   | 4 ++--
 src/FluidBufThreadDemo/FluidBufThreadDemo.cpp         | 4 ++--
 src/FluidBufTransientSlice/FluidBufTransientSlice.cpp | 5 ++---
 src/FluidBufTransients/FluidBufTransients.cpp         | 3 +--
 src/FluidNMFFilter/FluidNMFFilter.cpp                 | 4 ++--
 src/FluidNMFMatch/FluidNMFMatch.cpp                   | 4 ++--
 src/FluidNoveltySlice/FluidNoveltySlice.cpp           | 4 ++--
 src/FluidOnsetSlice/FluidOnsetSlice.cpp               | 4 ++--
 src/FluidTransientSlice/FluidTransientSlice.cpp       | 4 ++--
 18 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/FluidAmpSlice/FluidAmpSlice.cpp b/src/FluidAmpSlice/FluidAmpSlice.cpp
index 4a3abe0..3fd913a 100644
--- a/src/FluidAmpSlice/FluidAmpSlice.cpp
+++ b/src/FluidAmpSlice/FluidAmpSlice.cpp
@@ -1,7 +1,7 @@
 
 // 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/AmpSlice.hpp>
+#include <clients/rt/AmpSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<AmpSlice>("FluidAmpSlice", ft);
+  makeSCWrapper<AmpSliceClient>("FluidAmpSlice", ft);
 }
diff --git a/src/FluidBufAmpSlice/FluidBufAmpSlice.cpp b/src/FluidBufAmpSlice/FluidBufAmpSlice.cpp
index ce9116d..75a1476 100644
--- a/src/FluidBufAmpSlice/FluidBufAmpSlice.cpp
+++ b/src/FluidBufAmpSlice/FluidBufAmpSlice.cpp
@@ -2,7 +2,7 @@
 // FD_BufHPSS, an NRT buffer HPSS 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/rt/AmpSlice.hpp>
+#include <clients/rt/AmpSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -11,5 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedAmpSlice>("FluidBufAmpSlice", ft);
+  makeSCWrapper<NRTThreadedAmpSliceClient>("FluidBufAmpSlice", ft);
 }
diff --git a/src/FluidBufCompose/FluidBufCompose.cpp b/src/FluidBufCompose/FluidBufCompose.cpp
index ea5f763..826fd3e 100644
--- a/src/FluidBufCompose/FluidBufCompose.cpp
+++ b/src/FluidBufCompose/FluidBufCompose.cpp
@@ -1,7 +1,7 @@
 
 // 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 <clients/nrt/BufComposeClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedBufferCompose>("FluidBufCompose", ft);
+  makeSCWrapper<NRTThreadedBufComposeClient>("FluidBufCompose", ft);
 }
diff --git a/src/FluidBufHPSS/FluidBufHPSS.cpp b/src/FluidBufHPSS/FluidBufHPSS.cpp
index e87633e..46e2632 100644
--- a/src/FluidBufHPSS/FluidBufHPSS.cpp
+++ b/src/FluidBufHPSS/FluidBufHPSS.cpp
@@ -11,5 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedHPSS>("FluidBufHPSS", ft);
+  makeSCWrapper<NRTThreadedHPSSClient>("FluidBufHPSS", ft);
 }
diff --git a/src/FluidBufNMF/FluidBufNMF.cpp b/src/FluidBufNMF/FluidBufNMF.cpp
index 854370e..0d04400 100644
--- a/src/FluidBufNMF/FluidBufNMF.cpp
+++ b/src/FluidBufNMF/FluidBufNMF.cpp
@@ -8,5 +8,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedNMF>("FluidBufNMF", ft);
+  makeSCWrapper<NRTThreadedNMFClient>("FluidBufNMF", ft);
 }
diff --git a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
index 8880e1c..7429ab0 100644
--- a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
+++ b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp
@@ -1,8 +1,7 @@
 
 // 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/NoveltySlice.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
+#include <clients/rt/NoveltySliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadingNoveltySlice>("FluidBufNoveltySlice", ft);
+  makeSCWrapper<NRTThreadingNoveltySliceClient>("FluidBufNoveltySlice", ft);
 }
diff --git a/src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp b/src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp
index bbcb4fb..5455a14 100644
--- a/src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp
+++ b/src/FluidBufOnsetSlice/FluidBufOnsetSlice.cpp
@@ -1,8 +1,7 @@
 
 // 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/OnsetSlice.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
+#include <clients/rt/OnsetSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadingOnsetSlice>("FluidBufOnsetSlice", ft);
+  makeSCWrapper<NRTThreadingOnsetSliceClient>("FluidBufOnsetSlice", ft);
 }
diff --git a/src/FluidBufSines/FluidBufSines.cpp b/src/FluidBufSines/FluidBufSines.cpp
index 2fbf8e9..d37ad3c 100644
--- a/src/FluidBufSines/FluidBufSines.cpp
+++ b/src/FluidBufSines/FluidBufSines.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/SinesClient.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -11,5 +10,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedSines>("FluidBufSines", ft);
+  makeSCWrapper<NRTThreadedSinesClient>("FluidBufSines", ft);
 }
diff --git a/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp b/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp
index fba5c3e..62c8fa7 100644
--- a/src/FluidBufSpectralShape/FluidBufSpectralShape.cpp
+++ b/src/FluidBufSpectralShape/FluidBufSpectralShape.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/SpectralShapeClient.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
diff --git a/src/FluidBufStats/FluidBufStats.cpp b/src/FluidBufStats/FluidBufStats.cpp
index 8d33ad2..e80a5e3 100644
--- a/src/FluidBufStats/FluidBufStats.cpp
+++ b/src/FluidBufStats/FluidBufStats.cpp
@@ -1,7 +1,7 @@
 
 // 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/BufferStats.hpp>
+#include <clients/nrt/BufStatsClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedBufferStats>("FluidBufStats", ft);
+  makeSCWrapper<NRTThreadedBufStatsClient>("FluidBufStats", ft);
 }
diff --git a/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp b/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp
index ae810f3..1fabc40 100644
--- a/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp
+++ b/src/FluidBufThreadDemo/FluidBufThreadDemo.cpp
@@ -1,7 +1,7 @@
 
 // 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 <clients/nrt/FluidThreadTestClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedThreadTest>("FluidBufThreadDemo", ft);
+  makeSCWrapper<NRTThreadedThreadTestClient>("FluidBufThreadDemo", ft);
 }
diff --git a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
index ec539dd..87bce6d 100644
--- a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
+++ b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp
@@ -1,8 +1,7 @@
   // 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/rt/TransientSlice.hpp>
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
+#include <clients/rt/TransientSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable* ft;
@@ -10,5 +9,5 @@ static InterfaceTable* ft;
 PluginLoad(OfflineFluidDecompositionUGens) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedTransientSlice>("FluidBufTransientSlice", ft);
+  makeSCWrapper<NRTThreadedTransientSliceClient>("FluidBufTransientSlice", ft);
 }
diff --git a/src/FluidBufTransients/FluidBufTransients.cpp b/src/FluidBufTransients/FluidBufTransients.cpp
index 55c2da9..817bf97 100644
--- a/src/FluidBufTransients/FluidBufTransients.cpp
+++ b/src/FluidBufTransients/FluidBufTransients.cpp
@@ -1,5 +1,4 @@
 
-#include <clients/nrt/FluidNRTClientWrapper.hpp>
 #include <clients/rt/TransientClient.hpp>
 #include <FluidSCWrapper.hpp>
 
@@ -9,5 +8,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedTransients>("FluidBufTransients", ft);
+  makeSCWrapper<NRTThreadedTransientsClient>("FluidBufTransients", ft);
 }
diff --git a/src/FluidNMFFilter/FluidNMFFilter.cpp b/src/FluidNMFFilter/FluidNMFFilter.cpp
index 6e20346..1752c3f 100644
--- a/src/FluidNMFFilter/FluidNMFFilter.cpp
+++ b/src/FluidNMFFilter/FluidNMFFilter.cpp
@@ -1,7 +1,7 @@
 
 // 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/NMFFilter.hpp>
+#include <clients/rt/NMFFilterClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFFilter>("FluidNMFFilter", ft);
+  makeSCWrapper<NMFFilterClient>("FluidNMFFilter", ft);
 }
diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp
index 3a70e75..0170c1a 100644
--- a/src/FluidNMFMatch/FluidNMFMatch.cpp
+++ b/src/FluidNMFMatch/FluidNMFMatch.cpp
@@ -1,7 +1,7 @@
 
 // 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/NMFMatch.hpp>
+#include <clients/rt/NMFMatchClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NMFMatch>("FluidNMFMatch", ft);
+  makeSCWrapper<NMFMatchClient>("FluidNMFMatch", ft);
 }
diff --git a/src/FluidNoveltySlice/FluidNoveltySlice.cpp b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
index b2f5103..39cbc46 100644
--- a/src/FluidNoveltySlice/FluidNoveltySlice.cpp
+++ b/src/FluidNoveltySlice/FluidNoveltySlice.cpp
@@ -1,7 +1,7 @@
 
 // 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/NoveltySlice.hpp>
+#include <clients/rt/NoveltySliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NoveltySlice>("FluidNoveltySlice", ft);
+  makeSCWrapper<NoveltySliceClient>("FluidNoveltySlice", ft);
 }
diff --git a/src/FluidOnsetSlice/FluidOnsetSlice.cpp b/src/FluidOnsetSlice/FluidOnsetSlice.cpp
index f60f7a0..78fa1d7 100644
--- a/src/FluidOnsetSlice/FluidOnsetSlice.cpp
+++ b/src/FluidOnsetSlice/FluidOnsetSlice.cpp
@@ -1,7 +1,7 @@
 
 // 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/OnsetSlice.hpp>
+#include <clients/rt/OnsetSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -9,5 +9,5 @@ static InterfaceTable *ft;
 PluginLoad(FluidSTFTUGen) {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<OnsetSlice>("FluidOnsetSlice", ft);
+  makeSCWrapper<OnsetSliceClient>("FluidOnsetSlice", ft);
 }
diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp
index 5be8ace..babee6e 100644
--- a/src/FluidTransientSlice/FluidTransientSlice.cpp
+++ b/src/FluidTransientSlice/FluidTransientSlice.cpp
@@ -1,7 +1,7 @@
 
 // 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/TransientSlice.hpp>
+#include <clients/rt/TransientSliceClient.hpp>
 #include <FluidSCWrapper.hpp>
 
 static InterfaceTable *ft;
@@ -10,5 +10,5 @@ PluginLoad(FluidSTFTUGen)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<TransientsSlice>("FluidTransientSlice", ft);
+  makeSCWrapper<TransientsSliceClient>("FluidTransientSlice", ft);
 }