From a160a86c7675075c33b1a3a42eaca189372cdb4c Mon Sep 17 00:00:00 2001
From: Owen Green <gungwho@gmail.com>
Date: Mon, 5 Aug 2019 12:21:40 +0100
Subject: [PATCH] Merge threading into ClientMessaging, re-add argument parsing
 from sc_msg_iter

---
 include/FluidSCWrapper.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/FluidSCWrapper.hpp b/include/FluidSCWrapper.hpp
index e23494d..747e41f 100644
--- a/include/FluidSCWrapper.hpp
+++ b/include/FluidSCWrapper.hpp
@@ -369,6 +369,8 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
 
     auto fromArgs(World *, FloatControlsIter& args, LongT::type, int) { return args.next(); }
     auto fromArgs(World *, FloatControlsIter& args, FloatT::type, int) { return args.next(); }
+    auto fromArgs(World *, sc_msg_iter* args, LongT::type, int defVal) { return args->geti(defVal); }
+    auto fromArgs(World *, sc_msg_iter* args, FloatT::type, int) { return args->getf(); }
 
     auto fromArgs(World *w, ArgType args, BufferT::type, int)
     {
@@ -393,6 +395,8 @@ class FluidSCWrapper : public impl::FluidSCWrapperBase<C>
       return a.value();
     }
   };
+  template <size_t N, typename T>
+  using ArgumentSetter = Setter<sc_msg_iter*, N, T>;
 
   template <size_t N, typename T>
   using ControlSetter = Setter<FloatControlsIter&, N, T>;