#757 Make complex feedback probably work

helgoboss · Jun 2, 2023 · 0b9890c · 0b9890c
1 parent e1cc03b
commit 0b9890c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/main/lib/helgoboss-learn b/main/lib/helgoboss-learn
diff --git a/main/src/domain/eel_midi_source_script.rs b/main/src/domain/eel_midi_source_script.rs
@@ -58,8 +58,8 @@ impl MidiSourceScript for EelMidiSourceScript {
                 AbsoluteValue::Continuous(v) => v.get(),
                 AbsoluteValue::Discrete(f) => f.actual() as f64,
             },
-            // TODO-medium Make this work by using EEL string support.
-            FeedbackValue::Textual(t) => t.text.as_ptr() as isize as f64,
+            // Rest not supported for EEL
+            _ => f64::MIN,
         };
         let (slice, address) = unsafe {
             self.eel_unit.y.set(y_value);

diff --git a/main/src/domain/lua_midi_source_script.rs b/main/src/domain/lua_midi_source_script.rs
@@ -68,6 +68,11 @@ impl<'a> MidiSourceScript for LuaMidiSourceScript<'a> {
                 .text
                 .to_lua(self.lua.as_ref())
                 .map_err(|_| "couldn't convert string to Lua string")?,
+            FeedbackValue::Complex(v) => self
+                .lua
+                .as_ref()
+                .to_value(&v.value)
+                .map_err(|_| "couldn't convert complex value to Lua value")?,
         };
         // Set input data as variables "y" and "context".
         self.env

diff --git a/main/src/domain/lua_script_commons.rs b/main/src/domain/lua_script_commons.rs
@@ -1,6 +1,6 @@
 use helgoboss_learn::{
-    AbsoluteValue, FeedbackStyle, FeedbackValue, NumericFeedbackValue, RgbColor,
-    TextualFeedbackValue, UnitValue,
+    AbsoluteValue, ComplexFeedbackValue, FeedbackStyle, FeedbackValue, NumericFeedbackValue,
+    RgbColor, TextualFeedbackValue, UnitValue,
 };
 
 #[derive(Clone, serde::Serialize, serde::Deserialize)]
@@ -35,7 +35,9 @@ impl ScriptFeedbackEvent {
             Some(ScriptFeedbackValue::Text(t)) => {
                 FeedbackValue::Textual(TextualFeedbackValue::new(style, t.into()))
             }
-            Some(ScriptFeedbackValue::Complex(_)) => todo!(),
+            Some(ScriptFeedbackValue::Complex(v)) => {
+                FeedbackValue::Complex(ComplexFeedbackValue::new(style, v))
+            }
         }
     }
 }