From 6660cb53dc4262846c95a98ec44cf52f06305920 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Fri, 26 Oct 2018 10:53:09 +0100 Subject: [PATCH] All files: The great namespace purge --- include/fdNRTBase.hpp | 26 +++++++++---------- src/FluidBufCompose/FluidBufCompose.cpp | 12 ++++----- src/FluidBufHPSS/FluidBufHPSS.cpp | 18 ++++++------- src/FluidBufNMF/FluidBufNMF.cpp | 18 ++++++------- .../FluidBufNoveltySlice.cpp | 12 ++++----- src/FluidBufSines/FluidBufSines.cpp | 18 ++++++------- .../FluidBufTransientSlice.cpp | 12 ++++----- src/FluidBufTransients/FluidBufTransients.cpp | 12 ++++----- src/FluidGain/FluidGain.cpp | 8 +++--- src/FluidHPSS/FluidHPSS.cpp | 22 ++++++++-------- src/FluidNMFMatch/FluidNMFMatch.cpp | 16 ++++++------ src/FluidSTFTPass/FluidSTFTPass.cpp | 8 +++--- src/FluidSines/FluidSines.cpp | 20 +++++++------- .../FluidTransientSlice.cpp | 10 +++---- src/FluidTransients/FluidTransients.cpp | 20 +++++++------- 15 files changed, 116 insertions(+), 116 deletions(-) diff --git a/include/fdNRTBase.hpp b/include/fdNRTBase.hpp index 7897705..f67589c 100644 --- a/include/fdNRTBase.hpp +++ b/include/fdNRTBase.hpp @@ -18,7 +18,7 @@ //static InterfaceTable *ft; namespace fluid { -namespace sc{ +namespace wrapper{ /** A descendent of SndBuf that will populate itself from the NRT mirror buffers given a world and a bufnum @@ -37,7 +37,7 @@ namespace sc{ }; /** - A combination of SndBuf and parameter::BufferAdaptor (which, in turn, exposes FluidTensorView), for simple transfer of data + A combination of SndBuf and client::BufferAdaptor (which, in turn, exposes FluidTensorView), for simple transfer of data Given a World* and a buffer number, this will populate its SndBuf stuff from the NRT mirror buffers, and create a FluidTensorView wrapper of @@ -50,7 +50,7 @@ namespace sc{ nSamps = rows nChans = columns **/ - class SCBufferView: public NRTBuf, public parameter::BufferAdaptor + class SCBufferView: public NRTBuf, public client::BufferAdaptor { public: SCBufferView() = delete; @@ -153,7 +153,7 @@ namespace sc{ size_t mRank = 1; }; - class RTBufferView: public parameter::BufferAdaptor + class RTBufferView: public client::BufferAdaptor { public: RTBufferView(World* world, int bufnum): mWorld(world), mBufnum(bufnum) {} @@ -233,7 +233,7 @@ namespace sc{ class NRTCommandBase{ - using param_type = fluid::parameter::Instance; + using param_type = fluid::client::Instance; public: NRTCommandBase() = delete; NRTCommandBase(NRTCommandBase&) = delete; @@ -312,7 +312,7 @@ namespace sc{ } cmd << ", "; - if (d.getType() == parameter::Type::kBuffer) { + if (d.getType() == client::Type::kBuffer) { if (count == 0) cmd << d.getName() << ".bufnum"; else @@ -328,7 +328,7 @@ namespace sc{ ss << ";\n\n\t\tserver = server ? Server.default\n;" ; if (Client::getParamDescriptors()[0].getType() == - parameter::Type::kBuffer) { + client::Type::kBuffer) { ss << "if("< params = NRT_Plug::client_type::newParameterSet(); +// std::vector params = NRT_Plug::client_type::newParameterSet(); for (auto&& p: cmd->parameters()) { switch(p.getDescriptor().getType()) { - case parameter::Type::kBuffer: { + case client::Type::kBuffer: { long bufnum = static_cast(args->geti()); if (bufnum >= 0) { SCBufferView *buf = new SCBufferView(bufnum, inWorld); @@ -360,11 +360,11 @@ namespace sc{ } break; } - case parameter::Type::kLong: { + case client::Type::kLong: { p.setLong(static_cast(args->geti())); break; } - case parameter::Type::kFloat: { + case client::Type::kFloat: { p.setFloat(args->getf()); break; } @@ -388,14 +388,14 @@ namespace sc{ cmd->runCommand(inWorld, replyAddr, completionMsgData, completionMsgSize); } -} //namespace sc +} //namespace wrapper }//namespace fluid template void registerCommand(InterfaceTable* ft, const char* name) { - PlugInCmdFunc cmd = fluid::sc::command; + PlugInCmdFunc cmd = fluid::wrapper::command; (*ft->fDefinePlugInCmd)(name,cmd,nullptr); } diff --git a/src/FluidBufCompose/FluidBufCompose.cpp b/src/FluidBufCompose/FluidBufCompose.cpp index 997da3d..8016fc3 100644 --- a/src/FluidBufCompose/FluidBufCompose.cpp +++ b/src/FluidBufCompose/FluidBufCompose.cpp @@ -12,12 +12,12 @@ static InterfaceTable *ft; namespace fluid { - namespace sc{ + namespace wrapper{ class BufCompose: public NRTCommandBase { public: - using client_type = buf::BufferComposeClient; + using client_type = client::BufferComposeClient; using NRTCommandBase::NRTCommandBase; ~BufCompose() {} @@ -55,7 +55,7 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return bufferCompose.getParams(); } @@ -63,12 +63,12 @@ namespace fluid { client_type bufferCompose; client_type::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufCompose"); - fluid::sc::printCmd(ft,"BufCompose","FDCompose"); + registerCommand(ft, "BufCompose"); + fluid::wrapper::printCmd(ft,"BufCompose","FDCompose"); } diff --git a/src/FluidBufHPSS/FluidBufHPSS.cpp b/src/FluidBufHPSS/FluidBufHPSS.cpp index cd2879b..7e5c774 100644 --- a/src/FluidBufHPSS/FluidBufHPSS.cpp +++ b/src/FluidBufHPSS/FluidBufHPSS.cpp @@ -17,7 +17,7 @@ using fluid::FluidTensor; using fluid::FluidTensorView; namespace fluid { - namespace sc{ + namespace wrapper{ class BufHPSS: public NRTCommandBase { @@ -34,7 +34,7 @@ namespace fluid { – fft size */ public: - using client_type = hpss::HPSSClient; + using client_type = client::HPSSClient; using NRTCommandBase::NRTCommandBase; ~BufHPSS() {} @@ -48,7 +48,7 @@ namespace fluid { { //sanity check the parameters bool parametersOk; - hpss::HPSSClient::ProcessModel processModel; + client::HPSSClient::ProcessModel processModel; std::string whatHappened;//this will give us a message to pass back if param check fails std::tie(parametersOk,whatHappened,processModel) = processor.sanityCheck(); if(!parametersOk) @@ -82,20 +82,20 @@ namespace fluid { } - std::vector& parameters() + std::vector& parameters() { return processor.getParams(); } private: - hpss::HPSSClient processor; - hpss::HPSSClient::ProcessModel mModel; + client::HPSSClient processor; + client::HPSSClient::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufHPSS"); - fluid::sc::printCmd(ft,"BufHPSS","FDHPSS"); + registerCommand(ft, "BufHPSS"); + fluid::wrapper::printCmd(ft,"BufHPSS","FDHPSS"); } diff --git a/src/FluidBufNMF/FluidBufNMF.cpp b/src/FluidBufNMF/FluidBufNMF.cpp index 975bc84..bc14bec 100644 --- a/src/FluidBufNMF/FluidBufNMF.cpp +++ b/src/FluidBufNMF/FluidBufNMF.cpp @@ -19,10 +19,10 @@ static InterfaceTable *ft; //Using statements for fluidtensor using fluid::FluidTensor; using fluid::FluidTensorView; -using fluid::nmf::NMFClient; +using fluid::client::NMFClient; namespace fluid { - namespace sc{ + namespace wrapper{ class BufNMF: public NRTCommandBase { @@ -81,10 +81,10 @@ namespace fluid { nmf.process(processModel); mModel = processModel; - src = static_cast(parameter::lookupParam("src", nmf.getParams()).getBuffer()); - resynth = static_cast(parameter::lookupParam("resynthbuf", nmf.getParams()).getBuffer()); - dict = static_cast(parameter::lookupParam("filterbuf", nmf.getParams()).getBuffer()); - act = static_cast(parameter::lookupParam("envbuf", nmf.getParams()).getBuffer()); + src = static_cast(client::lookupParam("src", nmf.getParams()).getBuffer()); + resynth = static_cast(client::lookupParam("resynthbuf", nmf.getParams()).getBuffer()); + dict = static_cast(client::lookupParam("filterbuf", nmf.getParams()).getBuffer()); + act = static_cast(client::lookupParam("envbuf", nmf.getParams()).getBuffer()); return true; } @@ -113,7 +113,7 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return nmf.getParams(); } @@ -125,11 +125,11 @@ namespace fluid { SCBufferView* dict; SCBufferView* act; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufNMF"); + registerCommand(ft, "BufNMF"); } diff --git a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp index ca628c1..7950753 100644 --- a/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp +++ b/src/FluidBufNoveltySlice/FluidBufNoveltySlice.cpp @@ -13,12 +13,12 @@ static InterfaceTable *ft; namespace fluid { - namespace sc{ + namespace wrapper{ class BufNoveltySlice: public NRTCommandBase { public: - using client_type = segmentation::NoveltyClient; + using client_type = client::NoveltyClient; using NRTCommandBase::NRTCommandBase; ~BufNoveltySlice() {} @@ -56,7 +56,7 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return trans.getParams(); } @@ -64,12 +64,12 @@ namespace fluid { client_type trans; client_type::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufNoveltySlice"); - fluid::sc::printCmd(ft,"BufNoveltySlice","FluidBufNoveltySlice"); + registerCommand(ft, "BufNoveltySlice"); + fluid::wrapper::printCmd(ft,"BufNoveltySlice","FluidBufNoveltySlice"); } diff --git a/src/FluidBufSines/FluidBufSines.cpp b/src/FluidBufSines/FluidBufSines.cpp index d7fee1c..6cf22d4 100644 --- a/src/FluidBufSines/FluidBufSines.cpp +++ b/src/FluidBufSines/FluidBufSines.cpp @@ -17,7 +17,7 @@ using fluid::FluidTensor; using fluid::FluidTensorView; namespace fluid { - namespace sc{ + namespace wrapper{ class BufSines: public NRTCommandBase { @@ -39,7 +39,7 @@ namespace fluid { – fft size */ public: - using client_type = stn::SinesClient; + using client_type = client::SinesClient; using NRTCommandBase::NRTCommandBase; ~BufSines() {} @@ -53,7 +53,7 @@ namespace fluid { { //sanity check the parameters bool parametersOk; - stn::SinesClient::ProcessModel processModel; + client::SinesClient::ProcessModel processModel; std::string whatHappened;//this will give us a message to pass back if param check fails std::tie(parametersOk,whatHappened,processModel) = processor.sanityCheck(); if(!parametersOk) @@ -80,20 +80,20 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return processor.getParams(); } private: - stn::SinesClient processor; - stn::SinesClient::ProcessModel mModel; + client::SinesClient processor; + client::SinesClient::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufSines"); - fluid::sc::printCmd(ft,"BufSines","FDSines"); + registerCommand(ft, "BufSines"); + fluid::wrapper::printCmd(ft,"BufSines","FDSines"); } diff --git a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp index b9fcf94..2780a33 100644 --- a/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp +++ b/src/FluidBufTransientSlice/FluidBufTransientSlice.cpp @@ -14,12 +14,12 @@ static InterfaceTable *ft; namespace fluid { - namespace sc{ + namespace wrapper{ class BufTransientsSlice: public NRTCommandBase { public: - using client_type = segmentation::TransientSliceNRT; + using client_type = client::TransientSliceNRT; using NRTCommandBase::NRTCommandBase; ~BufTransientsSlice() {} @@ -58,7 +58,7 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return trans.getParams(); } @@ -66,12 +66,12 @@ namespace fluid { client_type trans; client_type::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufTransientSlice"); - fluid::sc::printCmd(ft,"BufTransientsSlice","FluidBufTransientSlice"); + registerCommand(ft, "BufTransientSlice"); + fluid::wrapper::printCmd(ft,"BufTransientsSlice","FluidBufTransientSlice"); } diff --git a/src/FluidBufTransients/FluidBufTransients.cpp b/src/FluidBufTransients/FluidBufTransients.cpp index 2031da7..a1cf3c5 100644 --- a/src/FluidBufTransients/FluidBufTransients.cpp +++ b/src/FluidBufTransients/FluidBufTransients.cpp @@ -12,12 +12,12 @@ static InterfaceTable *ft; namespace fluid { - namespace sc{ + namespace wrapper{ class BufTransients: public NRTCommandBase { public: - using client_type = str::TransientNRTClient; + using client_type = client::TransientNRTClient; using NRTCommandBase::NRTCommandBase; ~BufTransients() {} @@ -62,7 +62,7 @@ namespace fluid { return true; } - std::vector& parameters() + std::vector& parameters() { return trans.getParams(); } @@ -70,12 +70,12 @@ namespace fluid { client_type trans; client_type::ProcessModel mModel; };//class - } //namespace sc + } //namespace wrapper }//namespace fluid PluginLoad(OfflineFluidDecompositionUGens) { ft = inTable; - registerCommand(ft, "BufTransients"); - fluid::sc::printCmd(ft,"BufTransients","FDTransients"); + registerCommand(ft, "BufTransients"); + fluid::wrapper::printCmd(ft,"BufTransients","FDTransients"); } diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp index c2cd134..7454cf2 100644 --- a/src/FluidGain/FluidGain.cpp +++ b/src/FluidGain/FluidGain.cpp @@ -10,7 +10,7 @@ static InterfaceTable *ft; namespace fluid { class FDGain: public SCUnit { - using AudioClient = fluid::audio::GainAudioClient; + using AudioClient = fluid::client::GainAudioClient; using ClientPointer = std::unique_ptr; using SignalWrapper = AudioClient::Signal; using AudioSignal= AudioClient::AudioSignal; @@ -23,10 +23,10 @@ public: { mClient = ClientPointer(new AudioClient(65536)); - std::vector& params = mClient->getParams(); + std::vector& params = mClient->getParams(); - parameter::lookupParam("winsize", params).setLong(in0(1)); - parameter::lookupParam("hopsize", params).setLong(in0(1)); + client::lookupParam("winsize", params).setLong(in0(1)); + client::lookupParam("hopsize", params).setLong(in0(1)); mClient->setHostBufferSize(bufferSize()); mClient->reset(); diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp index 55c4e83..015e5ba 100644 --- a/src/FluidHPSS/FluidHPSS.cpp +++ b/src/FluidHPSS/FluidHPSS.cpp @@ -7,13 +7,13 @@ static InterfaceTable *ft; namespace fluid { -namespace hpss{ +namespace wrapper{ class FDRTHPSS: public SCUnit { - using AudioSignalWrapper = hpss::HPSSClient::AudioSignal; - using SignalWrapper = hpss::HPSSClient::Signal; + using AudioSignalWrapper = client::HPSSClient::AudioSignal; + using SignalWrapper = client::HPSSClient::Signal; using SignalPointer = std::unique_ptr; - using ClientPointer = std::unique_ptr>; + using ClientPointer = std::unique_ptr>; template using SignalArray = std::array; public: @@ -23,7 +23,7 @@ namespace hpss{ //psize hszie pthresh hthresh Window size, Hop size, FFT Size //Oh NO! Heap allocation! Make client object - mClient = ClientPointer(new hpss::HPSSClient(65536)); + mClient = ClientPointer(new client::HPSSClient(65536)); setParams(true); @@ -61,16 +61,16 @@ namespace hpss{ assert(mClient); for(size_t i = 0; i < mClient->getParams().size(); ++i) { - parameter::Instance& p = mClient->getParams()[i]; + client::Instance& p = mClient->getParams()[i]; if(!instantiation && p.getDescriptor().instantiation()) continue; switch(p.getDescriptor().getType()) { - case parameter::Type::kLong: + case client::Type::kLong: p.setLong(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kFloat: { + case client::Type::kFloat: { // We need to constrain threshold (normalised) frequency pairs at // runtime. @@ -78,7 +78,7 @@ namespace hpss{ auto constraint = paramConstraints.find(attrname); if (constraint != paramConstraints.end()) { - double limit = parameter::lookupParam(constraint->second.param, + double limit = client::lookupParam(constraint->second.param, mClient->getParams()) .getFloat(); @@ -91,7 +91,7 @@ namespace hpss{ p.checkRange(); } break; - case parameter::Type::kBuffer: + case client::Type::kBuffer: // p.setBuffer( in0(i+1)); break; default: @@ -134,7 +134,7 @@ namespace hpss{ PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FluidHPSS"); + registerUnit(ft, "FluidHPSS"); } diff --git a/src/FluidNMFMatch/FluidNMFMatch.cpp b/src/FluidNMFMatch/FluidNMFMatch.cpp index 8aec8b9..60f0a13 100644 --- a/src/FluidNMFMatch/FluidNMFMatch.cpp +++ b/src/FluidNMFMatch/FluidNMFMatch.cpp @@ -13,7 +13,7 @@ namespace fluid { namespace nmf{ class FDNMFMatch: public SCUnit { - using Client = NMFMatch; + using Client = client::NMFMatch; using AudioSignalWrapper = Client::AudioSignal; using SignalWrapper = Client::Signal; using SignalPointer = std::unique_ptr; @@ -45,7 +45,7 @@ namespace nmf{ return; } - mRank = parameter::lookupParam("rank", mClient->getParams()).getLong(); + mRank = client::lookupParam("rank", mClient->getParams()).getLong(); mClient->setHostBufferSize(bufferSize()); @@ -71,27 +71,27 @@ namespace nmf{ assert(mClient); for(size_t i = 0; i < mClient->getParams().size(); ++i) { - parameter::Instance& p = mClient->getParams()[i]; + client::Instance& p = mClient->getParams()[i]; if(!instantiation && p.getDescriptor().instantiation()) continue; switch(p.getDescriptor().getType()) { - case parameter::Type::kLong: + case client::Type::kLong: p.setLong(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kFloat: { + case client::Type::kFloat: { p.setFloat(in0(i + 1)); p.checkRange(); } break; - case parameter::Type::kBuffer: { + case client::Type::kBuffer: { long bufnum = static_cast(in0(i+1)); - sc::RTBufferView* currentBuf = static_cast(p.getBuffer()); + wrapper::RTBufferView* currentBuf = static_cast(p.getBuffer()); if(bufnum >= 0 && (currentBuf? (currentBuf->bufnum() != bufnum) : true)){ - sc::RTBufferView* buf = new sc::RTBufferView(mWorld,bufnum); + wrapper::RTBufferView* buf = new wrapper::RTBufferView(mWorld,bufnum); p.setBuffer(buf); } break; diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp index c41cb7d..3ef3cef 100644 --- a/src/FluidSTFTPass/FluidSTFTPass.cpp +++ b/src/FluidSTFTPass/FluidSTFTPass.cpp @@ -12,8 +12,8 @@ namespace fluid { class FDSTFTPass: public SCUnit { - using AudioSignalWrapper = audio::BaseSTFTClient::AudioSignal; - using SignalWrapper = audio::BaseSTFTClient::Signal; + using AudioSignalWrapper = client::BaseSTFTClient::AudioSignal; + using SignalWrapper = client::BaseSTFTClient::Signal; // using SignalPointer = std::unique_ptr; public: @@ -28,7 +28,7 @@ public: const float fftSize = in0(3); //Oh NO! Heap allocation! Make client object - mClient = new audio::BaseSTFTClient(65536); + mClient = new client::BaseSTFTClient(65536); mClient->getParams()[0].setLong(windowSize); mClient->getParams()[1].setLong(hopSize); mClient->getParams()[2].setLong(fftSize); @@ -75,7 +75,7 @@ private: mClient->doProcess(std::begin(inputSignals),std::end(inputSignals),std::begin(outputSignals), std::end(outputSignals),numsamples,1,1); } - audio::BaseSTFTClient *mClient; + client::BaseSTFTClient *mClient; SignalWrapper *inputSignals[1]; SignalWrapper *outputSignals[1]; }; diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp index 445e043..9f2f93a 100644 --- a/src/FluidSines/FluidSines.cpp +++ b/src/FluidSines/FluidSines.cpp @@ -7,11 +7,11 @@ static InterfaceTable *ft; namespace fluid { -namespace stn{ +namespace wrapper{ class FDRTSines: public SCUnit { - using AudioSignalWrapper = stn::SinesClient::AudioSignal; - using SignalWrapper = stn::SinesClient::Signal; + using AudioSignalWrapper = client::SinesClient::AudioSignal; + using SignalWrapper = client::SinesClient::Signal; // using SignalPointer = std::unique_ptr; public: @@ -31,7 +31,7 @@ namespace stn{ // //Oh NO! Heap allocation! Make client object - mClient = new stn::SinesClient(65536); + mClient = new client::SinesClient(65536); setParams(true); // m_client->getParams()[0].setLong(pfilter_size); @@ -81,22 +81,22 @@ namespace stn{ assert(mClient); for(size_t i = 0; i < mClient->getParams().size(); ++i) { - parameter::Instance& p = mClient->getParams()[i]; + client::Instance& p = mClient->getParams()[i]; if(!instantiation && p.getDescriptor().instantiation()) continue; switch(p.getDescriptor().getType()) { - case parameter::Type::kLong: + case client::Type::kLong: p.setLong(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kFloat: + case client::Type::kFloat: p.setFloat(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kBuffer: + case client::Type::kBuffer: // p.setBuffer( in0(i+1)); break; default: @@ -117,7 +117,7 @@ namespace stn{ mClient->doProcess(std::begin(inputSignals),std::end(inputSignals),std::begin(outputSignals), std::end(outputSignals),numsamples,1,2); } - stn::SinesClient *mClient; + client::SinesClient *mClient; SignalWrapper *inputSignals[1]; SignalWrapper *outputSignals[2]; }; @@ -126,6 +126,6 @@ namespace stn{ PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FluidSines"); + registerUnit(ft, "FluidSines"); } diff --git a/src/FluidTransientSlice/FluidTransientSlice.cpp b/src/FluidTransientSlice/FluidTransientSlice.cpp index 0061978..25e96fa 100644 --- a/src/FluidTransientSlice/FluidTransientSlice.cpp +++ b/src/FluidTransientSlice/FluidTransientSlice.cpp @@ -10,7 +10,7 @@ namespace fluid { namespace segmentation{ class FluidSliceTransients: public SCUnit { - using audio_client = TransientsSlice; + using audio_client = client::TransientsSlice; using AudioSignalWrapper = audio_client::AudioSignal; using SignalWrapper = audio_client::Signal; @@ -59,22 +59,22 @@ namespace segmentation{ assert(mClient); for(size_t i = 0; i < mClient->getParams().size(); ++i) { - parameter::Instance& p = mClient->getParams()[i]; + client::Instance& p = mClient->getParams()[i]; if(!instantiation && p.getDescriptor().instantiation()) continue; switch(p.getDescriptor().getType()) { - case parameter::Type::kLong: + case client::Type::kLong: p.setLong(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kFloat: + case client::Type::kFloat: p.setFloat(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kBuffer: + case client::Type::kBuffer: // p.setBuffer( in0(i+1)); break; default: diff --git a/src/FluidTransients/FluidTransients.cpp b/src/FluidTransients/FluidTransients.cpp index 1f9f8d8..a9627d7 100644 --- a/src/FluidTransients/FluidTransients.cpp +++ b/src/FluidTransients/FluidTransients.cpp @@ -7,11 +7,11 @@ static InterfaceTable *ft; namespace fluid { -namespace stn{ +namespace wrapper{ class FluidTransients: public SCUnit { - using AudioSignalWrapper = stn::TransientsClient::AudioSignal; - using SignalWrapper = stn::TransientsClient::Signal; + using AudioSignalWrapper = client::TransientsClient::AudioSignal; + using SignalWrapper = client::TransientsClient::Signal; // using SignalPointer = std::unique_ptr; public: @@ -31,7 +31,7 @@ namespace stn{ // //Oh NO! Heap allocation! Make client object - mClient = new stn::TransientsClient(65536); + mClient = new client::TransientsClient(65536); setParams(true); // mClient->geParams()[0].setLong(pfilter_size); @@ -80,22 +80,22 @@ namespace stn{ assert(mClient); for(size_t i = 0; i < mClient->getParams().size(); ++i) { - parameter::Instance& p = mClient->getParams()[i]; + client::Instance& p = mClient->getParams()[i]; if(!instantiation && p.getDescriptor().instantiation()) continue; switch(p.getDescriptor().getType()) { - case parameter::Type::kLong: + case client::Type::kLong: p.setLong(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kFloat: + case client::Type::kFloat: p.setFloat(in0(i + 1)); p.checkRange(); break; - case parameter::Type::kBuffer: + case client::Type::kBuffer: // p.setBuffer( in0(i+1)); break; default: @@ -116,7 +116,7 @@ namespace stn{ mClient->doProcess(std::begin(inputSignals),std::end(inputSignals),std::begin(outputSignals), std::end(outputSignals),numsamples,1,2); } - stn::TransientsClient *mClient; + client::TransientsClient *mClient; SignalWrapper *inputSignals[1]; SignalWrapper *outputSignals[2]; }; @@ -125,5 +125,5 @@ namespace stn{ PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FluidTransients"); + registerUnit(ft, "FluidTransients"); }