Small code fixes, add an usefule for_nth_mapped_n2 function in predic…

…ate_reflection
celtera · May 5, 2024 · 7763a02 · 7763a02
1 parent d4cc209
commit 7763a02
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/examples/Advanced/Granular/Granolette.hpp b/examples/Advanced/Granular/Granolette.hpp
@@ -44,7 +44,10 @@ class Granolette
       return;
 
     if(outputs.audio.channels != inputs.sound.channels())
+    {
       outputs.audio.request_channels(inputs.sound.channels());
+      return;
+    }
 
     // Just take the first channel of the soundfile.
     // in is a std::span

diff --git a/examples/Helpers/ValueDelay.hpp b/examples/Helpers/ValueDelay.hpp
@@ -4,6 +4,7 @@
 
 #include <Gamma/Delay.h>
 #include <Gamma/ipl.h>
+#include <halp/audio.hpp>
 #include <halp/compat/gamma.hpp>
 #include <halp/controls.hpp>
 #include <halp/controls_fmt.hpp>

diff --git a/include/avnd/binding/ossia/node.hpp b/include/avnd/binding/ossia/node.hpp
@@ -851,22 +851,13 @@ class safe_node_base : public safe_node_base_base<T>
     return true;
   }
 
-  void soundfile_release_request(std::string& str, int idx)
-  {
-    fprintf(stderr, "%s:%d\n", str.c_str(), idx);
-  }
-
-  void soundfile_load_request(std::string& str, int idx)
-  {
-    fprintf(stderr, "%s:%d\n", str.c_str(), idx);
-  }
   void midifile_load_request(std::string& str, int idx)
   {
-    fprintf(stderr, "%s:%d\n", str.c_str(), idx);
+    fprintf(stderr, "midifile_load_request %s:%d\n", str.c_str(), idx);
   }
   void raw_file_load_request(std::string& str, int idx)
   {
-    fprintf(stderr, "%s:%d\n", str.c_str(), idx);
+    fprintf(stderr, "raw_file_load_request %s:%d\n", str.c_str(), idx);
   }
 
   template <std::size_t N, std::size_t NField>

diff --git a/include/avnd/binding/ossia/port_run_preprocess.hpp b/include/avnd/binding/ossia/port_run_preprocess.hpp
@@ -300,7 +300,7 @@ struct process_before_run
     if(!str)
       return;
 
-    self.soundfile_load_request(*str, Idx);
+    self.soundfiles.load_request(*str, Idx);
   }
 
   template <avnd::midifile_port Field, std::size_t Idx>

diff --git a/include/avnd/binding/ossia/soundfiles.hpp b/include/avnd/binding/ossia/soundfiles.hpp
@@ -162,6 +162,9 @@ struct soundfile_storage : soundfile_input_storage<T>
       }
     }
   }
+
+  // std::function<void(std::string& str, int idx)> release_request;
+  std::function<void(std::string& str, int idx)> load_request;
 };
 }
 

diff --git a/include/avnd/common/struct_reflection.hpp b/include/avnd/common/struct_reflection.hpp
@@ -500,6 +500,28 @@ struct predicate_introspection
           }(indices_n{});
     }
   }
+  static constexpr void
+  for_nth_mapped_n2(type& unfiltered_fields, int n, auto&& func) noexcept
+  {
+    if constexpr(size > 0)
+    {
+      auto stack_size_helper
+          = [&]<std::size_t Index, std::size_t LocalIndex>() constexpr noexcept {
+        func(
+            pfr::get<Index>(unfiltered_fields), avnd::predicate_index<LocalIndex>{},
+            avnd::field_index<Index>{});
+      };
+
+      [stack_size_helper, k = index_map[n], &func,
+       &unfiltered_fields]<typename K, K... Index, size_t... LocalIndex>(
+          std::integer_sequence<K, Index...>,
+          std::integer_sequence<size_t, LocalIndex...>) {
+        (void)((Index == k
+                && (stack_size_helper.template operator()<Index, LocalIndex>(), true))
+               || ...);
+      }(indices_n{}, std::make_index_sequence<size>{});
+    }
+  }
 };
 
 template <>