lcoogan
/
flucoma-sc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add LocalBuf awareness

Browse Source
nix
Owen Green 6 years ago
parent 897fbb97ea
commit 3109a51842
2 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File

55
include/FluidSCWrapper.hpp
Unescape Escape View File

@ -107,7 +107,8 @@ public:
: mControlsIterator{mInBuf + mSpecialIndex + 1,
static_cast<index>(mNumInputs) - mSpecialIndex - 1},
mParams{Wrapper::Client::getParameterDescriptors()},
mClient{Wrapper::setParams(mParams, mWorld->mVerbosity > 0, mWorld,
mClient{Wrapper::setParams(static_cast<Wrapper*>(this),
mParams, mWorld->mVerbosity > 0, mWorld,
mControlsIterator, true)}
{}
@ -249,7 +250,7 @@ public:
NonRealTime()
: mControlsIterator{mInBuf, index(mNumInputs) - mSpecialIndex - 2},
mParams{Wrapper::Client::getParameterDescriptors()},
mClient{Wrapper::setParams(mParams, mWorld->mVerbosity > 0, mWorld,
mClient{Wrapper::setParams(static_cast<Wrapper*>(this), mParams, mWorld->mVerbosity > 0, mWorld,
mControlsIterator, true)},
mSynchronous{mNumInputs > 2 ? (in0(int(mNumInputs) - 1) > 0) : false}
{}
@ -590,14 +591,14 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
return tag == 's';
}
static auto fromArgs(World*, sc_msg_iter* args, std::string, int)
static auto fromArgs(FluidSCWrapper*, World*, sc_msg_iter* args, std::string, int)
{
const char* recv = args->gets("");
return std::string(recv ? recv : "");
}
static auto fromArgs(World* w, FloatControlsIter& args, std::string, int)
static auto fromArgs(FluidSCWrapper*,World* w, FloatControlsIter& args, std::string, int)
{
// first is string size, then chars
index size = static_cast<index>(args.next());
@ -623,21 +624,21 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
template <typename T>
static std::enable_if_t<std::is_integral<T>::value, T>
fromArgs(World*, FloatControlsIter& args, T, int)
fromArgs(FluidSCWrapper*,World*, FloatControlsIter& args, T, int)
{
return static_cast<index>(args.next());
}
template <typename T>
static std::enable_if_t<std::is_floating_point<T>::value, T>
fromArgs(World*, FloatControlsIter& args, T, int)
fromArgs(FluidSCWrapper*,World*, FloatControlsIter& args, T, int)
{
return args.next();
}
template <typename T>
static std::enable_if_t<std::is_integral<T>::value, T>
fromArgs(World*, sc_msg_iter* args, T, int defVal)
fromArgs(FluidSCWrapper*,World*, sc_msg_iter* args, T, int defVal)
{
return args->geti(defVal);
}
@ -649,25 +650,39 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
return args->getf();
}
static auto fromArgs(World* w, ArgType args, BufferT::type&, int)
static SCBufferAdaptor* fetchBuffer(FluidSCWrapper* x, World* w, index bufnum)
{
if(bufnum >= w->mNumSndBufs)
{
index localBufNum = bufnum - w->mNumSndBufs;
Graph* parent = static_cast<Unit*>(x)->mParent;
return localBufNum <= parent -> localMaxBufNum ?
new SCBufferAdaptor(parent->mLocalSndBufs + localBufNum,w,true)
: nullptr;
}
else
return bufnum >= 0 ? new SCBufferAdaptor(bufnum, w) : nullptr;
}
static auto fromArgs(FluidSCWrapper* x,World* w, ArgType args, BufferT::type&, int)
{
typename LongT::type bufnum = static_cast<typename LongT::type>(
ParamReader::fromArgs(w, args, typename LongT::type(), -1));
return BufferT::type(bufnum >= 0 ? new SCBufferAdaptor(bufnum, w)
: nullptr);
ParamReader::fromArgs(x, w, args, typename LongT::type(), -1));
return BufferT::type(fetchBuffer(x,w,bufnum));
}
static auto fromArgs(World* w, ArgType args, InputBufferT::type&, int)
static auto fromArgs(FluidSCWrapper* x,World* w, ArgType args, InputBufferT::type&, int)
{
typename LongT::type bufnum =
static_cast<LongT::type>(fromArgs(w, args, LongT::type(), -1));
return InputBufferT::type(bufnum >= 0 ? new SCBufferAdaptor(bufnum, w)
: nullptr);
static_cast<LongT::type>(fromArgs(x, w, args, LongT::type(), -1));
return InputBufferT::type(fetchBuffer(x,w,bufnum));
}
template <typename P>
static std::enable_if_t<IsSharedClient<P>::value, P>
fromArgs(World* w, ArgType args, P&, int)
fromArgs(FluidSCWrapper*,World* w, ArgType args, P&, int)
{
return {fromArgs(w, args, std::string{}, 0).c_str()};
}
@ -681,7 +696,7 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
static constexpr index argSize =
C::getParameterDescriptors().template get<N>().fixedSize;
typename T::type operator()(World* w, ArgType args)
typename T::type operator()(FluidSCWrapper* x, World* w, ArgType args)
{
// Just return default if there's nothing left to grab
if (args.remain() == 0)
@ -697,7 +712,7 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
for (index i = 0; i < argSize; i++)
a[i] = static_cast<LiteralType>(
ParamReader<ArgType>::fromArgs(w, args, a[0], 0));
ParamReader<ArgType>::fromArgs(x, w, args, a[0], 0));
return a.value();
}
@ -1066,7 +1081,7 @@ public:
ft->fDefineUnitCmd(name, "version", doVersion);
}
static auto& setParams(ParameterSetType& p, bool verbose, World* world,
static auto& setParams(FluidSCWrapper* x, ParameterSetType& p, bool verbose, World* world,
FloatControlsIter& inputs, bool constrain = false)
{
//TODO: Regain this robustness if possible?
@ -1074,7 +1089,7 @@ public:
// We won't even try and set params if the arguments don't match
// if (inputs.size() == C::getParameterDescriptors().count())
// {
p.template setParameterValues<ControlSetter>(verbose, world, inputs);
p.template setParameterValues<ControlSetter>(verbose, x, world, inputs);
if (constrain) p.constrainParameterValues();
// }
// else

20
include/SCBufferAdaptor.hpp
Unescape Escape View File

@ -69,7 +69,9 @@ public:
SCBufferAdaptor(SCBufferAdaptor&&) = default;
SCBufferAdaptor(SndBuf* buf, World* world, bool local)
: NRTBuf{buf}, mWorld{world}, mLocal{local}
{}
SCBufferAdaptor(index bufnum, World* world, bool rt = false)
: NRTBuf(world, bufnum, rt), mBufnum(bufnum), mWorld(world)
@ -79,6 +81,8 @@ public:
void assignToRT(World* rtWorld)
{
if(mLocal) return;
SndBuf* rtBuf = World_GetBuf(rtWorld, static_cast<uint32>(mBufnum));
*rtBuf = *mBuffer;
rtWorld->mSndBufUpdates[mBufnum].writes++;
@ -101,7 +105,7 @@ public:
// knows about
bool valid() const override
{
return (exists() && mBufnum >= 0 && mBufnum < asSigned(mWorld->mNumSndBufs));
return (exists() && (mLocal ? true : mBufnum >= 0 && mBufnum < asSigned(mWorld->mNumSndBufs)));
}
bool exists() const override { return mBuffer && mBuffer->data; }
@ -161,6 +165,17 @@ public:
const Result resize(index frames, index channels, double sampleRate) override
{
SndBuf* thisThing = mBuffer;
if(mLocal) // don't try and resize
{
if(frames > thisThing->frames || channels > thisThing->channels)
{
return {Result::Status::kError, "Local buffer must be presized adequetly, need",
frames, "frames", channels, "channels." };
}
else return {};
}
mOldData = thisThing->data;
int allocResult =
mWorld->ft->fBufAlloc(mBuffer, static_cast<int>(channels),
@ -184,6 +199,7 @@ protected:
float* mOldData{0};
index mBufnum;
World* mWorld;
bool mLocal{false};
};
std::ostream& operator<<(std::ostream& os, SCBufferAdaptor& b)

Write Preview
Loading…
Cancel
Save