diff --git a/include/wrapper/ArgsToClient.hpp b/include/wrapper/ArgsToClient.hpp index 2538a5c..c9bb1c4 100644 --- a/include/wrapper/ArgsToClient.hpp +++ b/include/wrapper/ArgsToClient.hpp @@ -39,7 +39,7 @@ namespace client { { return allocSizeImpl(std::forward(t), std::index_sequence_for()); - }; + } template static std::tuple, index> @@ -53,11 +53,11 @@ namespace client { return std::make_tuple(res, size); // array of offsets into allocated buffer & // total number of floats to alloc - }; + } static void convert(float* f, typename BufferT::type buf) { - f[0] = static_cast(buf.get())->bufnum(); + f[0] = static_cast(static_cast(buf.get())->bufnum()); } template @@ -129,8 +129,7 @@ namespace client { static index numTags(std::tuple&&) { return std::tuple_size>::value; - }; - + } static void getTag(Packet& p, typename BufferT::type) { p.addtag('i'); } @@ -161,21 +160,21 @@ namespace client { static void convert(Packet& p, typename BufferT::type buf) { - p.addi(static_cast(buf.get())->bufnum()); + p.addi(static_cast(static_cast(buf.get())->bufnum())); } template static std::enable_if_t::value> convert(Packet& p, T x) { - p.addi(x); + p.addi(static_cast(x)); } template static std::enable_if_t::value> convert(Packet& p, T x) { - p.addf(x); + p.addf(static_cast(x)); } static void convert(Packet& p, std::string s) diff --git a/include/wrapper/RealTimeBase.hpp b/include/wrapper/RealTimeBase.hpp index ab2cca7..88bcf3a 100644 --- a/include/wrapper/RealTimeBase.hpp +++ b/include/wrapper/RealTimeBase.hpp @@ -125,22 +125,17 @@ namespace impl{ void next(SCUnit& unit, Client& client,Params& params,FloatControlsIter& controls) { bool trig = IsModel_t::value ? !mPrevTrig && unit.in0(0) > 0 : false; - bool shouldProcess = IsModel_t::value ? trig : true; + mPrevTrig = trig; -// if(shouldProcess) -// { - // controls.reset(unit.mInBuf + unit.mSpecialIndex + 1); - Wrapper::setParams(&unit, params, controls); - params.constrainParameterValues(); -// } + Wrapper::setParams(&unit, params, controls); + params.constrainParameterValues(); for (index i = 0; i < client.audioChannelsIn(); ++i) { assert(i <= std::numeric_limits::max()); if (mInputConnections[asUnsigned(i)]) - mAudioInputs[asUnsigned(i)].reset(const_cast(unit.in(static_cast(i))), 0, - unit.fullBufferSize()); + mAudioInputs[asUnsigned(i)].reset(const_cast(unit.in(static_cast(i))), 0,unit.fullBufferSize()); } for (index i = 0; i < client.audioChannelsOut(); ++i)