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

Constrain params before constructing clients

Browse Source
nix
Owen Green 6 years ago
parent 1cbe5d0187
commit 23785e88be
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File

8
include/FluidSCWrapper.hpp
Unescape Escape View File

@ -595,7 +595,7 @@ struct LifetimePolicy<Client, Wrapper,std::false_type, std::false_type>
{ {
FloatControlsIter controlsReader{unit->mInBuf + Wrapper::ControlOffset(unit),Wrapper::ControlSize(unit)}; FloatControlsIter controlsReader{unit->mInBuf + Wrapper::ControlOffset(unit),Wrapper::ControlSize(unit)};
auto params = typename Wrapper::ParamSetType{Client::getParameterDescriptors()}; auto params = typename Wrapper::ParamSetType{Client::getParameterDescriptors()};
Wrapper::setParams(unit, params, controlsReader); Wrapper::setParams(unit, params, controlsReader,true);
Client client{params}; Client client{params};
new (static_cast<Wrapper*>(unit)) Wrapper(std::move(controlsReader), std::move(client), std::move(params)); new (static_cast<Wrapper*>(unit)) Wrapper(std::move(controlsReader), std::move(client), std::move(params));
} }
@ -631,7 +631,7 @@ struct LifetimePolicy<Client, Wrapper,std::true_type, std::false_type>
std::cout << "ERROR: ID " << uid << "is already being used by the cache" << std::endl; std::cout << "ERROR: ID " << uid << "is already being used by the cache" << std::endl;
return; return;
} }
Wrapper::setParams(unit, entry.params,controlsReader); Wrapper::setParams(unit, entry.params,controlsReader,true);
new (static_cast<Wrapper*>(unit)) Wrapper{std::move(controlsReader),std::move(client),std::move(params)}; new (static_cast<Wrapper*>(unit)) Wrapper{std::move(controlsReader),std::move(client),std::move(params)};
static_cast<Wrapper*>(unit)->uid = uid; static_cast<Wrapper*>(unit)->uid = uid;
entry.leased = true; entry.leased = true;
@ -698,8 +698,10 @@ struct LifetimePolicy<Client, Wrapper,std::false_type, std::true_type>
FloatControlsIter controlsReader{unit->mInBuf + Wrapper::ControlOffset(unit),Wrapper::ControlSize(unit)}; FloatControlsIter controlsReader{unit->mInBuf + Wrapper::ControlOffset(unit),Wrapper::ControlSize(unit)};
auto params = typename Client::ParamSetType{Client::getParameterDescriptors()}; auto params = typename Client::ParamSetType{Client::getParameterDescriptors()};
Wrapper::setParams(unit, params,controlsReader); Wrapper::setParams(unit, params,controlsReader,true);
auto& name = params.template get<0>(); auto& name = params.template get<0>();
auto client = Client{params}; auto client = Client{params};
auto clientRef = SharedType::lookup(name); auto clientRef = SharedType::lookup(name);

Write Preview
Loading…
Cancel
Save