[max/pd] Tuple input

celtera · Oct 1, 2024 · 36b08a8 · 36b08a8
1 parent 957832f
commit 36b08a8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/include/avnd/binding/max/from_atoms.hpp b/include/avnd/binding/max/from_atoms.hpp
@@ -261,7 +261,18 @@ struct from_atoms
   // FIXME
   template<avnd::tuple_ish T>
     requires (!avnd::pair_ish<T>)
-  bool operator()(T& v) const noexcept { return false; }
+  bool operator()(T& v) const noexcept
+  {
+    static constexpr int N = std::tuple_size_v<T>;
+    if(ac < N)
+      return false;
+
+    [&]<std::size_t... I>(std::index_sequence<I...>) {
+      (from_atom{av[I]}(std::get<I>(v)), ...);
+    }(std::make_index_sequence<N>{});
+
+    return true;
+  }
 
 
   bool operator()(avnd::variant_ish auto& v) const noexcept

diff --git a/include/avnd/binding/pd/inputs.hpp b/include/avnd/binding/pd/inputs.hpp
@@ -10,6 +10,7 @@
 #endif
 
 #include <cstring>
+#include <cmath>
 #include <mutex>
 namespace pd
 {
@@ -247,10 +248,20 @@ struct from_atoms
     return from_atom{av[0]}(v);
   }
 
-  // FIXME
-  template<avnd::tuple_ish T>
-    requires (!avnd::pair_ish<T>)
-  bool operator()(T& v) const noexcept { return false; }
+  template <avnd::tuple_ish T>
+    requires(!avnd::pair_ish<T>)
+  bool operator()(T& v) const noexcept
+  {
+    static constexpr int N = std::tuple_size_v<T>;
+    if(ac < N)
+      return false;
+
+    [&]<std::size_t... I>(std::index_sequence<I...>) {
+      (from_atom{av[I]}(std::get<I>(v)), ...);
+    }(std::make_index_sequence<N>{});
+
+    return true;
+  }
 
   bool operator()(avnd::variant_ish auto& v) const noexcept
   {