FnMut -> Trait

1 files changed, 36 insertions, 10 deletions

diff --git a/mumd/src/audio/transformers.rs b/mumd/src/audio/transformers.rs
index 5c9681b..6994a40 100644
--- a/mumd/src/audio/transformers.rs
+++ b/mumd/src/audio/transformers.rs
@@ -1,17 +1,43 @@
-use dasp_ring_buffer::Bounded;
+pub trait Transformer {
+    fn transform<'a>(&mut self, buf: &'a mut [f32]) -> Option<&'a mut [f32]>;
+}
+
+pub struct NoiseGate {
+    alltime_high: f32,
+    open: usize,
+    deactivation_delay: usize,
+}
+
+impl NoiseGate {
+    pub fn new(deactivation_delay: usize) -> Self {
+        Self {
+            alltime_high: 0.0,
+            open: 0,
+            deactivation_delay,
+        }
+    }
+}
 
+impl Transformer for NoiseGate {
+    fn transform<'a>(&mut self, buf: &'a mut [f32]) -> Option<&'a mut [f32]> {
+        const MUTE_PERCENTAGE: f32 = 0.1;
 
-pub fn create_noise_gate(chunks: usize, mute_percentage: f32) -> impl FnMut(&mut [f32]) -> Option<&mut [f32]> {
-    let mut peaks = Bounded::from_full(vec![0.0; chunks]);
-    let mut alltime_high: f32 = 0.0;
-    move |buf: &mut [f32]| {
         let max = buf.iter().map(|e| e.abs()).max_by(|a, b| a.partial_cmp(b).unwrap()).unwrap();
-        peaks.push(max);
-        alltime_high = alltime_high.max(max);
-        if peaks.iter().any(|e| *e >= alltime_high * mute_percentage) {
-            Some(buf)
-        } else {
+
+        if max > self.alltime_high {
+            self.alltime_high = max;
+        }
+
+        if max > self.alltime_high * MUTE_PERCENTAGE {
+            self.open = self.deactivation_delay;
+        } else if self.open > 0 {
+            self.open -= 1;
+        }
+
+        if self.open == 0 {
             None
+        } else {
+            Some(buf)
         }
     }
 }