v1.3.4 PolyFilter update and reworking

ardura · Oct 4, 2024 · 54e99ae · 54e99ae
1 parent 8e2bac1
commit 54e99ae
Show file tree

Hide file tree

Showing 9 changed files with 2,233 additions and 1,488 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,8 @@ nih_plug = { git = "https://github.com/ardura/nih-plug.git", rev = "de315f902d7b
 nih_plug_egui = { git = "https://github.com/ardura/nih-plug.git", rev = "de315f902d7b5a75f80bc9d4164e4485bf2b34a1" }
 
 # egui_file fork for nih-plug/Actuate
-egui_file = { git = "https://github.com/ardura/egui_file.git", rev = "33c96389cd1c5e40c5d2ece87ef7f86a1df53cb2" }
+egui_file = { git = "https://github.com/ardura/egui_file.git", rev = "b75a8504d3008a7694708e8951cb8f226fa61007" }
+#older one 33c96389cd1c5e40c5d2ece87ef7f86a1df53cb2
 
 num-complex = "0.4.4"
 num-traits = "0.2.17"
@@ -34,6 +35,7 @@ rand_pcg = "0.3.1"
 serde = "1.0.188"
 serde_json = "1.0.107"
 dirs = "5.0.1"
+noisy_float = "0.2.0"
 
 [profile.release]
 opt-level = 3

diff --git a/src/actuate_gui.rs b/src/actuate_gui.rs
@@ -156,7 +156,7 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
                         // This would cause a deadlock and break Actuate :|
                         // Maybe in future this will become nicer
                         if params.am1_sample.lock().unwrap()[0].len() > 1 && 
-                           AM1.lock().unwrap().loaded_sample[0][0] == 0.0 &&
+                           AM1.lock().unwrap().loaded_sample[0].len() <= 1 &&
                            AM1.lock().unwrap().sample_lib[0][0][0] == 0.0 &&
                            (AM1.lock().unwrap().audio_module_type == AudioModuleType::Sampler ||
                             AM1.lock().unwrap().audio_module_type == AudioModuleType::Granulizer)
@@ -168,7 +168,7 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
                             AM1_Lock.regenerate_samples();
                         }
                         if params.am2_sample.lock().unwrap()[0].len() > 1 && 
-                           AM2.lock().unwrap().loaded_sample[0][0] == 0.0 &&
+                           AM2.lock().unwrap().loaded_sample[0].len() <= 1 &&
                            AM2.lock().unwrap().sample_lib[0][0][0] == 0.0 &&
                            (AM2.lock().unwrap().audio_module_type == AudioModuleType::Sampler ||
                             AM2.lock().unwrap().audio_module_type == AudioModuleType::Granulizer)
@@ -180,7 +180,7 @@ pub(crate) fn make_actuate_gui(instance: &mut Actuate, _async_executor: AsyncExe
                             AM2_Lock.regenerate_samples();
                         }
                         if params.am3_sample.lock().unwrap()[0].len() > 1 && 
-                           AM3.lock().unwrap().loaded_sample[0][0] == 0.0 &&
+                           AM3.lock().unwrap().loaded_sample[0].len() <= 1 &&
                            AM3.lock().unwrap().sample_lib[0][0][0] == 0.0 &&
                            (AM3.lock().unwrap().audio_module_type == AudioModuleType::Sampler ||
                             AM3.lock().unwrap().audio_module_type == AudioModuleType::Granulizer)