adapt to client name changes from refactoring of fluid_decomposition

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);
 }

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);
 }

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);
 }

src/FluidBufHPSS/FluidBufHPSS.cpp

@@ -11,5 +11,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedHPSS>("FluidBufHPSS", ft);
+  makeSCWrapper<NRTThreadedHPSSClient>("FluidBufHPSS", ft);
 }

src/FluidBufNMF/FluidBufNMF.cpp

@@ -8,5 +8,5 @@ PluginLoad(OfflineFluidDecompositionUGens)
 {
   ft = inTable;
   using namespace fluid::client;
-  makeSCWrapper<NRTThreadedNMF>("FluidBufNMF", ft);
+  makeSCWrapper<NRTThreadedNMFClient>("FluidBufNMF", ft);
 }

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);
 }

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);
 }

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);
 }

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;

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }