micromap: fix that time-related variables were broken in non-array cases

ossia · Feb 17, 2025 · ee4fd38 · ee4fd38
1 parent 0026a25
commit ee4fd38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 25 deletions.
diff --git a/src/plugins/score-plugin-fx/Fx/MathHelpers.hpp b/src/plugins/score-plugin-fx/Fx/MathHelpers.hpp
@@ -28,22 +28,6 @@ static void setMathExpressionTiming(
   self.cur_pos = parent_dur > 0 ? double(input_time) / parent_dur : 0;
 }
 
-template <typename State>
-static void setMathExpressionTiming(
-    State& self, ossia::time_value input_time, ossia::time_value prev_time,
-    ossia::time_value parent_dur, double modelToSamples)
-{
-  setMathExpressionTiming(
-      self, input_time.impl * modelToSamples, prev_time.impl * modelToSamples,
-      parent_dur.impl * modelToSamples);
-}
-
-// template <typename State>
-// static void setMathExpressionTiming(State& self, const ossia::token_request& tk, ossia::exec_state_facade st)
-// {
-//   setMathExpressionTiming(self, tk.date, tk.prev_date, tk.parent_duration, st.modelToSamples());
-// }
-
 template <typename State>
 static void setMathExpressionTiming(State& self, const halp::tick_flicks& tk)
 {

diff --git a/src/plugins/score-plugin-fx/Fx/MathMapping_generic.hpp b/src/plugins/score-plugin-fx/Fx/MathMapping_generic.hpp
@@ -120,16 +120,10 @@ struct GenericMathMapping
       const ossia::value& v, value_output_callback& output, const halp::tick_flicks& tk,
       State& self)
   {
-    //auto ratio = st.modelToSamples();
-    //auto parent_dur = tk.parent_duration * ratio;
-    //for(const ossia::timed_value& v : input.get_data())
-    //{
-    //  int64_t new_time = tk.prev_date.impl * ratio + timestamp;
-    //  setMathExpressionTiming(self, new_time, self.last_value_time, parent_dur);
-    //  self.last_value_time = new_time;
+    setMathExpressionTiming(
+        self, tk.start_in_flicks, self.last_value_time, tk.relative_position);
+    self.last_value_time = tk.start_in_flicks;
 
-    // FIXME
-    //  setMathExpressionTiming(self, new_time, self.last_value_time, parent_dur);
     switch(v.get_type())
     {
       case ossia::val_type::NONE: