Enable control inputs, change control output layout

include/wrapper/RealTimeBase.hpp

@@ -5,9 +5,12 @@
 namespace fluid {
 namespace client {
 namespace impl {
+
+
 template <typename Client, class Wrapper>
 struct RealTimeBase
 {
+  using IOMapFn = void (RealTimeBase::*)(SCUnit&, Client&);
   using HostVector = FluidTensorView<float, 1>;
   using Params = typename Client::ParamSetType;
   template <typename T, bool>
@@ -29,7 +32,6 @@ namespace impl{
 
         // fastforward
         for (index i = 0; i < statedSize; ++i) c.next();
-            
       }
     }
   };
@@ -50,15 +52,16 @@ namespace impl{
 
         // fastforward
         for (index i = 0; i < statedSize; ++i) c.next();
-            
       }
     }
   };
   template <size_t N, typename T>
-    struct ExpectedCount{
+  struct ExpectedCount
+  {
     void operator()(const T& descriptor, FloatControlsIter& c, Result& status)
     {
-        doExpectedCount<T,IsSharedClientRef<typename T::type>::value>::count(descriptor,c,status);
+      doExpectedCount<T, IsSharedClientRef<typename T::type>::value>::count(
+          descriptor, c, status);
     }
   };
 
@@ -66,7 +69,9 @@ namespace impl{
   {
     if (controls.size() < Client::getParameterDescriptors().count())
     {
-        return {Result::Status::kError,"Fewer parameters than exepected. Got ", controls.size(), "expect at least", Client::getParameterDescriptors().count()};
+      return {Result::Status::kError, "Fewer parameters than exepected. Got ",
+              controls.size(), "expect at least",
+              Client::getParameterDescriptors().count()};
     }
 
     Result countScan;
@@ -76,71 +81,89 @@ namespace impl{
     return countScan;
   }
 
-    // static index ControlOffset(Unit* unit) { return unit->mSpecialIndex + 1; }
-    // static index ControlSize(Unit* unit) { return static_cast<index>(unit->mNumInputs) - unit->mSpecialIndex - 1  -(IsModel_t<Client>::value ? 1 : 0); }
-    
   void init(SCUnit& unit, Client& client, FloatControlsIter& controls)
   {
-      assert(!(client.audioChannelsOut() > 0 && client.controlChannelsOut() > 0) &&"Client can't have both audio and control outputs");
+    assert(!(client.audioChannelsOut() > 0 &&
-      // consoltr.reset(unit.mInBuf + unit.mSpecialIndex + 1);
+             client.controlChannelsOut().count > 0) &&
+           "Client can't have both audio and control outputs");
     client.sampleRate(unit.fullSampleRate());
     mInputConnections.reserve(asUnsigned(client.audioChannelsIn()));
     mOutputConnections.reserve(asUnsigned(client.audioChannelsOut()));
-      mAudioInputs.reserve(asUnsigned(client.audioChannelsIn()));
-      mOutputs.reserve(asUnsigned(
-          std::max(client.audioChannelsOut(), client.controlChannelsOut())));
-
 
     Result r;
     if (!(r = expectedSize(controls)).ok())
     {
-//            mCalcFunc = Wrapper::getInterfaceTable()->fClearUnitOutputs;
+      std::cout << "ERROR: " << Wrapper::getName()
-            std::cout
+                << " wrong number of arguments." << r.message() << std::endl;
-                << "ERROR: " << Wrapper::getName()
-                << " wrong number of arguments."
-                << r.message()
-                << std::endl;
       return;
     }
 
-
+    if (client.audioChannelsIn())
+    {
+      mAudioInputs.reserve(asUnsigned(client.audioChannelsIn()));
       for (index i = 0; i < client.audioChannelsIn(); ++i)
       {
         mInputConnections.emplace_back(unit.isAudioRateIn(static_cast<int>(i)));
         mAudioInputs.emplace_back(nullptr, 0, 0);
       }
+      mInputMapper = &RealTimeBase::mapAudioInputs;
+    }
+    else if (client.controlChannelsIn())
+    {
+      mControlInputBuffer.resize(unit.mSpecialIndex + 1);
+      mAudioInputs.emplace_back(mControlInputBuffer);
+      mInputMapper = &RealTimeBase::mapControlInputs;
+    }
 
+    index outputSize = client.controlChannelsOut().size > 0
+                           ? std::max(client.audioChannelsOut(),
+                                      client.controlChannelsOut().size)
+                           : unit.mSpecialIndex + 1;
+    mOutputs.reserve(asUnsigned(outputSize));
+
+    if (client.audioChannelsOut())
+    {
       for (index i = 0; i < client.audioChannelsOut(); ++i)
       {
         mOutputConnections.emplace_back(true);
         mOutputs.emplace_back(nullptr, 0, 0);
       }
       
-      for (index i = 0; i < client.controlChannelsOut(); ++i)
+      mOutMapperPre = &RealTimeBase::mapAudioOutputs;
-      { 
+      mOutMapperPost = &RealTimeBase::mapNoOp;
-        mOutputs.emplace_back(nullptr, 0, 0); 
     }
+    else
+    {
+      index totalControlOutputs =
+          client.controlChannelsOut().count * outputSize;
+      mControlOutputBuffer.resize(totalControlOutputs);
+      for (index i = 0; i < client.controlChannelsOut().count; ++i)
+      {
+        mOutputs.emplace_back(
+            mControlOutputBuffer(fluid::Slice(i * outputSize, outputSize)));
       }
 
-   void next(SCUnit& unit, Client& client,Params& params,FloatControlsIter& controls,bool updateParams = true)
+      mOutMapperPre = &RealTimeBase::mapNoOp;
-   {   
+      mOutMapperPost = &RealTimeBase::mapControlOutputs;
-     bool trig =  IsModel_t<Client>::value ? !mPrevTrig  && unit.in0(0) > 0 : false;
+    }
+  }
 
-     mPrevTrig = trig;
+  void mapNoOp(SCUnit&, Client&) {}
 
-     if(updateParams)
+  void mapAudioInputs(SCUnit& unit, Client& client)
   {
-      Wrapper::setParams(&unit, params, controls);
-      params.constrainParameterValuesRT(nullptr);
-     }
-     
     for (index i = 0; i < client.audioChannelsIn(); ++i)
     {
       assert(i <= std::numeric_limits<int>::max());
       if (mInputConnections[asUnsigned(i)])
-         mAudioInputs[asUnsigned(i)].reset(const_cast<float*>(unit.in(static_cast<int>(i))), 0,unit.fullBufferSize());
+        mAudioInputs[asUnsigned(i)].reset(
+            const_cast<float*>(unit.in(static_cast<int>(i))), 0,
+            unit.fullBufferSize());
+    }
   }
 
+  void mapAudioOutputs(SCUnit& unit, Client& client)
+  {
     for (index i = 0; i < client.audioChannelsOut(); ++i)
     {
       assert(i <= std::numeric_limits<int>::max());
@@ -148,22 +171,59 @@ namespace impl{
         mOutputs[asUnsigned(i)].reset(unit.out(static_cast<int>(i)), 0,
                                       unit.fullBufferSize());
     }
+  }
+
+  void mapControlInputs(SCUnit& unit, Client& client)
+  {
+    for (index i = 0; i < unit.mSpecialIndex + 1; ++i)
+    {
+      assert(i <= std::numeric_limits<int>::max());
+      mControlInputBuffer[asUnsigned(i)] = unit.in0(static_cast<int>(i));
+    }
+  }
 
-     for (index i = 0; i < client.controlChannelsOut(); ++i)
+  void mapControlOutputs(SCUnit& unit, Client& client)
+  {
+    for (index i = 0; i < mControlOutputBuffer.size(); ++i)
     {
       assert(i <= std::numeric_limits<int>::max());
-       mOutputs[asUnsigned(i)].reset(unit.out(static_cast<int>(i)), 0, 1);
+      unit.out0(static_cast<int>(i)) = mControlOutputBuffer(i);
+    }
+  }
+
+  void next(SCUnit& unit, Client& client, Params& params,
+            FloatControlsIter& controls, bool updateParams = true)
+  {
+    bool trig =
+        IsModel_t<Client>::value ? !mPrevTrig && unit.in0(0) > 0 : false;
+
+    mPrevTrig = trig;
+
+    if (updateParams)
+    {
+      Wrapper::setParams(&unit, params, controls);
+      params.constrainParameterValuesRT(nullptr);
     }
+
+    (this->*mInputMapper)(unit, client);
+    (this->*mOutMapperPre)(unit, client);
     client.process(mAudioInputs, mOutputs, mContext);
+    (this->*mOutMapperPost)(unit, client);
   }
+
 private:
   std::vector<bool>       mInputConnections;
   std::vector<bool>       mOutputConnections;
   std::vector<HostVector> mAudioInputs;
   std::vector<HostVector> mOutputs;
+  FluidTensor<float, 1>   mControlInputBuffer;
+  FluidTensor<float, 1>   mControlOutputBuffer;
   FluidContext            mContext;
   bool                    mPrevTrig;
+  IOMapFn                 mInputMapper;
+  IOMapFn                 mOutMapperPre;
+  IOMapFn                 mOutMapperPost;
 };
-}
+} // namespace impl
-}
+} // namespace client
-}
+} // namespace fluid