From 481dd955ba525c19acd7346d5e19f3fc33fa4a2e Mon Sep 17 00:00:00 2001 From: Alex Harker Date: Fri, 15 Mar 2019 14:15:53 +0000 Subject: [PATCH] The wrapper now takes care of processing type - all objects updated to fit the new design --- include/FluidSCWrapper.hpp | 16 ++++++++-------- src/FluidBufCompose/FluidBufCompose.cpp | 8 ++++---- src/FluidBufHPSS/FluidBufHPSS.cpp | 8 +++++--- src/FluidBufNMF/FluidBufNMF.cpp | 6 ++++-- .../FluidBufNoveltySlice.cpp | 5 +++-- src/FluidBufSines/FluidBufSines.cpp | 5 +++-- .../FluidBufTransientSlice.cpp | 2 +- src/FluidBufTransients/FluidBufTransients.cpp | 6 ++++-- src/FluidGain/FluidGain.cpp | 5 +++-- src/FluidHPSS/FluidHPSS.cpp | 9 +++------ src/FluidNMFMatch/FluidNMFMatch.cpp | 9 +++------ src/FluidSTFTPass/FluidSTFTPass.cpp | 7 ++++--- src/FluidSines/FluidSines.cpp | 6 +++--- src/FluidTransientSlice/FluidTransientSlice.cpp | 5 +++-- src/FluidTransients/FluidTransients.cpp | 5 +++-- 15 files changed, 54 insertions(+), 48 deletions(-) diff --git a/include/FluidSCWrapper.hpp b/include/FluidSCWrapper.hpp index a66c772..83e799d 100644 --- a/include/FluidSCWrapper.hpp +++ b/include/FluidSCWrapper.hpp @@ -260,13 +260,13 @@ protected: template class NonRealTime { - using Params = typename Client::Params; + using ParamSetType = typename Client::ParamSetType; public: static void setup(InterfaceTable *ft, const char *name) { DefinePlugInCmd(name, launch, nullptr); } NonRealTime(World *world, sc_msg_iter *args) - : mParams{*Wrapper::getParamDescriptors()} + : mParams{Client::getParameterDescriptor()} , mClient{mParams} {} @@ -275,10 +275,10 @@ public: static void launch(World *world, void *inUserData, struct sc_msg_iter *args, void *replyAddr) { - if (args->tags && ((std::string{args->tags}.size() - 1) != Wrapper::getParamDescriptors()->count())) + if (args->tags && ((std::string{args->tags}.size() - 1) != Client::getParameterDescriptor().count())) { std::cout << "ERROR: " << Wrapper::getName() << " wrong number of arguments. Expected " - << Wrapper::getParamDescriptors()->count() << ", got " << (std::string{args->tags}.size() - 1) + << Client::getParameterDescriptor().count() << ", got " << (std::string{args->tags}.size() - 1) << ". Your .sc file and binary plugin might be different versions." << std::endl; return; } @@ -314,8 +314,8 @@ public: static void destroy(World *world, void *data) { delete static_cast(data); } protected: - ParameterSet mParams; - Client mClient; + ParamSetType mParams; + Client mClient; private: static Result validateParameters(NonRealTime *w, World *world, sc_msg_iter *args) @@ -470,10 +470,10 @@ public: } }; -template +template class Client> void makeSCWrapper(const char *name, InterfaceTable *ft) { - FluidSCWrapper::setup(ft, name); + FluidSCWrapper>::setup(ft, name); } } // namespace client diff --git a/src/FluidBufCompose/FluidBufCompose.cpp b/src/FluidBufCompose/FluidBufCompose.cpp index 316ecff..256009f 100644 --- a/src/FluidBufCompose/FluidBufCompose.cpp +++ b/src/FluidBufCompose/FluidBufCompose.cpp @@ -1,3 +1,4 @@ + // 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 @@ -5,10 +6,9 @@ static InterfaceTable *ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufCompose", BufComposeParams, ft); -// registerCommand(ft, "BufCompose"); -// fluid::wrapper::printCmd(ft,"BufCompose","FDCompose"); + makeSCWrapper("BufCompose", ft); } diff --git a/src/FluidBufHPSS/FluidBufHPSS.cpp b/src/FluidBufHPSS/FluidBufHPSS.cpp index 8737d38..d4f7114 100644 --- a/src/FluidBufHPSS/FluidBufHPSS.cpp +++ b/src/FluidBufHPSS/FluidBufHPSS.cpp @@ -1,4 +1,5 @@ - // FD_BufHPSS, an NRT buffer HPSS Processor + +// 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 @@ -6,8 +7,9 @@ static InterfaceTable *ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufHPSS",NRTHPSSParams,ft); + makeSCWrapper("BufHPSS", ft); } diff --git a/src/FluidBufNMF/FluidBufNMF.cpp b/src/FluidBufNMF/FluidBufNMF.cpp index abd323d..c649d03 100644 --- a/src/FluidBufNMF/FluidBufNMF.cpp +++ b/src/FluidBufNMF/FluidBufNMF.cpp @@ -1,10 +1,12 @@ + #include #include static InterfaceTable *ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufNMF",NMFParams, ft); + makeSCWrapper("BufNMF", ft); } diff --git a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp index 8f0d64e..443f28b 100644 --- a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp +++ b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp @@ -7,8 +7,9 @@ static InterfaceTable* ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufNoveltySlice",NoveltyParams,ft); + makeSCWrapper("BufNoveltySlice", ft); } diff --git a/src/FluidBufSines/FluidBufSines.cpp b/src/FluidBufSines/FluidBufSines.cpp index 2368551..b1d135e 100644 --- a/src/FluidBufSines/FluidBufSines.cpp +++ b/src/FluidBufSines/FluidBufSines.cpp @@ -7,9 +7,10 @@ static InterfaceTable *ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufSines",NRTSineParams,ft); + makeSCWrapper("BufSines", ft); } diff --git a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp index 68fade3..b7a6536 100644 --- a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp +++ b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp @@ -10,5 +10,5 @@ static InterfaceTable* ft; PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; using namespace fluid::client; - makeSCWrapper("BufTransientSlice",NRTTransientSliceParams, ft); + makeSCWrapper("BufTransientSlice", ft); } diff --git a/src/FluidBufTransients/FluidBufTransients.cpp b/src/FluidBufTransients/FluidBufTransients.cpp index 3102005..b6758e5 100644 --- a/src/FluidBufTransients/FluidBufTransients.cpp +++ b/src/FluidBufTransients/FluidBufTransients.cpp @@ -1,11 +1,13 @@ + #include #include #include static InterfaceTable *ft; -PluginLoad(OfflineFluidDecompositionUGens) { +PluginLoad(OfflineFluidDecompositionUGens) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper("BufTransients",NRTTransientParams,ft); + makeSCWrapper("BufTransients", ft); } diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp index c78809a..286b3c0 100644 --- a/src/FluidGain/FluidGain.cpp +++ b/src/FluidGain/FluidGain.cpp @@ -6,8 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidGainUgen) { +PluginLoad(FluidGainUgen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidGain", ft); + makeSCWrapper("FluidGain", ft); } diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp index 0ffe410..3b4677f 100644 --- a/src/FluidHPSS/FluidHPSS.cpp +++ b/src/FluidHPSS/FluidHPSS.cpp @@ -6,12 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { +PluginLoad(FluidSTFTUGen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidHPSS", ft); + makeSCWrapper("FluidHPSS", ft); } - - - - diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp index 1e8c0df..3a70e75 100644 --- a/src/FluidNMFMatch/FluidNMFMatch.cpp +++ b/src/FluidNMFMatch/FluidNMFMatch.cpp @@ -6,12 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { +PluginLoad(FluidSTFTUGen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidNMFMatch", ft); + makeSCWrapper("FluidNMFMatch", ft); } - - - - diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp index 64e6b2f..7447259 100644 --- a/src/FluidSTFTPass/FluidSTFTPass.cpp +++ b/src/FluidSTFTPass/FluidSTFTPass.cpp @@ -6,8 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { - ft = inTable; +PluginLoad(FluidSTFTUGen) +{ + ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidSTFTPass", ft); + makeSCWrapper("FluidSTFTPass", ft); } diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp index f0baddb..2a2f032 100644 --- a/src/FluidSines/FluidSines.cpp +++ b/src/FluidSines/FluidSines.cpp @@ -6,9 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { +PluginLoad(FluidSTFTUGen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidSines", ft); + makeSCWrapper("FluidSines", ft); } - diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp index 14d9f1b..5be8ace 100644 --- a/src/FluidTransientSlice/FluidTransientSlice.cpp +++ b/src/FluidTransientSlice/FluidTransientSlice.cpp @@ -6,8 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { +PluginLoad(FluidSTFTUGen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidTransientSlice",ft); + makeSCWrapper("FluidTransientSlice", ft); } diff --git a/src/FluidTransients/FluidTransients.cpp b/src/FluidTransients/FluidTransients.cpp index 0c86d3d..162f7fc 100644 --- a/src/FluidTransients/FluidTransients.cpp +++ b/src/FluidTransients/FluidTransients.cpp @@ -6,8 +6,9 @@ static InterfaceTable *ft; -PluginLoad(FluidSTFTUGen) { +PluginLoad(FluidSTFTUGen) +{ ft = inTable; using namespace fluid::client; - makeSCWrapper>("FluidTransients", ft); + makeSCWrapper("FluidTransients", ft); }