From 0a1789f842ae7dfa7412424afea5e7249ccfa4f9 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Thu, 17 Dec 2020 09:49:21 +0000 Subject: [PATCH 1/3] Restore version command --- include/FluidSCWrapper.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/FluidSCWrapper.hpp b/include/FluidSCWrapper.hpp index 79f7d24..c5bbae0 100644 --- a/include/FluidSCWrapper.hpp +++ b/include/FluidSCWrapper.hpp @@ -66,6 +66,14 @@ public: getInterfaceTable(ft); impl::FluidSCWrapperBase::setup(ft, name); ft->fDefineUnitCmd(name, "version", doVersion); + + std::string commandName("/"); + commandName += getName(); + commandName += "/version"; + ft->fDefinePlugInCmd(commandName.c_str(), + [](World*, void*, sc_msg_iter*, void*){ doVersion(nullptr,nullptr); }, + nullptr); + } static auto& setParams(Unit* x, ParamSetType& p, From 5b89d279e4e03044227993e9b63023d310e403a2 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Thu, 17 Dec 2020 09:49:48 +0000 Subject: [PATCH 2/3] Unused param warning --- include/wrapper/Messaging.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wrapper/Messaging.hpp b/include/wrapper/Messaging.hpp index 5fea09c..40cb50f 100644 --- a/include/wrapper/Messaging.hpp +++ b/include/wrapper/Messaging.hpp @@ -178,7 +178,7 @@ struct FluidSCMessaging{ world); return true; }, - [](World* world, void* data) // NRT Thread: Send reply + [](World*, void* data) // NRT Thread: Send reply { MessageData* m = static_cast(data); if(m->result.status() != Result::Status::kError) From 1dc3409561eecb770eccf099bff3c7bac30ca9a5 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Thu, 17 Dec 2020 15:33:11 +0000 Subject: [PATCH 3/3] Fix retiggering of syncrhonous Buf*.kr --- include/wrapper/NonRealtime.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wrapper/NonRealtime.hpp b/include/wrapper/NonRealtime.hpp index 41dd150..adc74d8 100644 --- a/include/wrapper/NonRealtime.hpp +++ b/include/wrapper/NonRealtime.hpp @@ -423,6 +423,7 @@ namespace impl { if(result.ok()) { + ptr->mDone = false; mResult = client.process(); Wrapper::printResult(world,mResult); @@ -760,10 +761,9 @@ namespace impl { mPreviousTrigger = mTrigger; mTrigger = 0; auto& client = ptr->mClient; - + if(trigger) { - mDone = 0; mControlsIterator.reset(1 + mInBuf); //add one for ID auto& params = ptr->mParams; Wrapper::setParams(this,params,mControlsIterator,true,false);