Better makeup gain

p42ul · Mar 2, 2024 · b44d4b1 · b44d4b1
1 parent dc8956a
commit b44d4b1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "resotool"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Paul Buser <[email protected]>"]
 license = "GPL-3.0-or-later"

diff --git a/src/voicer/mod.rs b/src/voicer/mod.rs
@@ -74,22 +74,21 @@ impl Voicer {
         let voices: [Voice; NUM_VOICES] = std::array::from_fn(|_| Voice::default());
         let voices_sounding: Shared<f32> = Shared::new(0.0);
         let wetdry = Shared::new(1.0);
-        let filterbank = stack::<VoiceSize, _, _>(|i| {
+        let filterbank = sum::<VoiceSize, _, _>(|i| {
             let voice = &voices[i as usize];
-            (
-                pass() *
-                (
-                    var(&voice.trigger) >>
-                    (adsr::adsr_shared(voice.adsr.attack.clone(),
-                                       voice.adsr.decay.clone(),
-                                       voice.adsr.sustain.clone(),
-                                       voice.adsr.release.clone())))
-                    | var(&voice.cutoff) | var(&voice.bandwidth
-                )
-            )
-                >> resonator() * var_fn(&voices_sounding, |vs| NUM_VOICES as f32 / vs)
+            (pass()
+                * (var(&voice.trigger)
+                    >> (adsr::adsr_shared(
+                        voice.adsr.attack.clone(),
+                        voice.adsr.decay.clone(),
+                        voice.adsr.sustain.clone(),
+                        voice.adsr.release.clone(),
+                    )))
+                | var(&voice.cutoff)
+                | var(&voice.bandwidth))
+                >> resonator()
         });
-        let wet = (split() >> filterbank >> join()) * var(&wetdry);
+        let wet = (split() >> filterbank) * var(&wetdry);
         let dry = pass() * var_fn(&wetdry, |wd| 1.0 - wd);
         let audio = Box::new(wet & dry);
         Self {