Add LevelStage test and cleanup unused fields (#46)

Author: OpenSauce

presets/High_Gain.json

@@ -6,7 +6,7 @@
     {
       "Filter": {
         "filter_type": "Highpass",
-        "cutoff_hz": 68.0,
+        "cutoff_hz": 575.0,
         "resonance": 0.2
       }
     },
@@ -27,10 +27,10 @@
     {
       "ToneStack": {
         "model": "British",
-        "bass": 0.65000004,
-        "mid": 0.90000004,
-        "treble": 0.7,
-        "presence": 0.4
+        "bass": 0.75,
+        "mid": 0.8,
+        "treble": 0.75,
+        "presence": 0.65000004
       }
     },
     {
@@ -45,7 +45,7 @@
     {
       "Preamp": {
         "gain": 6.8,
-        "bias": 0.0,
+        "bias": 1.4901161e-8,
         "clipper_type": "Hard"
       }
     },
@@ -62,6 +62,11 @@
         "hold_ms": 10.0,
         "release_ms": 100.0
       }
+    },
+    {
+      "Level": {
+        "gain": 0.75
+      }
     }
   ]
 }

src/gui/app.rs

@@ -360,38 +360,28 @@ impl AmplifierApp {
 fn build_amplifier_chain(stages: &[StageConfig], sample_rate: f32) -> AmplifierChain {
     let mut chain = AmplifierChain::new();
 
-    for (idx, stage) in stages.iter().enumerate() {
+    for stage in stages.iter() {
         match stage {
             StageConfig::Filter(cfg) => {
-                chain.add_stage(Box::new(
-                    cfg.to_stage(&format!("Filter {idx}"), sample_rate),
-                ));
+                chain.add_stage(Box::new(cfg.to_stage(sample_rate)));
             }
             StageConfig::Preamp(cfg) => {
-                chain.add_stage(Box::new(cfg.to_stage(&format!("Preamp {idx}"))));
+                chain.add_stage(Box::new(cfg.to_stage()));
             }
             StageConfig::Compressor(cfg) => {
-                chain.add_stage(Box::new(
-                    cfg.to_stage(&format!("Compressor {idx}"), sample_rate),
-                ));
+                chain.add_stage(Box::new(cfg.to_stage(sample_rate)));
             }
             StageConfig::ToneStack(cfg) => {
-                chain.add_stage(Box::new(
-                    cfg.to_stage(&format!("ToneStack {idx}"), sample_rate),
-                ));
+                chain.add_stage(Box::new(cfg.to_stage(sample_rate)));
             }
             StageConfig::PowerAmp(cfg) => {
-                chain.add_stage(Box::new(
-                    cfg.to_stage(&format!("PowerAmp {idx}"), sample_rate),
-                ));
+                chain.add_stage(Box::new(cfg.to_stage(sample_rate)));
             }
             StageConfig::Level(cfg) => {
-                chain.add_stage(Box::new(cfg.to_stage(&format!("Level {idx}"))));
+                chain.add_stage(Box::new(cfg.to_stage()));
             }
             StageConfig::NoiseGate(cfg) => {
-                chain.add_stage(Box::new(
-                    cfg.to_stage(&format!("NoiseGate {idx}"), sample_rate),
-                ));
+                chain.add_stage(Box::new(cfg.to_stage(sample_rate)));
             }
         }
     }

src/gui/config/compressor.rs

@@ -23,9 +23,8 @@ impl Default for CompressorConfig {
 }
 
 impl CompressorConfig {
-    pub fn to_stage(&self, name: &str, sample_rate: f32) -> CompressorStage {
+    pub fn to_stage(&self, sample_rate: f32) -> CompressorStage {
         CompressorStage::new(
-            name,
             self.attack_ms,
             self.release_ms,
             self.threshold_db,

src/gui/config/filter.rs

@@ -19,9 +19,8 @@ impl Default for FilterConfig {
 }
 
 impl FilterConfig {
-    pub fn to_stage(&self, name: &str, sample_rate: f32) -> FilterStage {
+    pub fn to_stage(&self, sample_rate: f32) -> FilterStage {
         FilterStage::new(
-            name,
             self.filter_type,
             self.cutoff_hz,
             self.resonance,

src/gui/config/level.rs

@@ -13,7 +13,7 @@ impl Default for LevelConfig {
 }
 
 impl LevelConfig {
-    pub fn to_stage(&self, name: &str) -> LevelStage {
-        LevelStage::new(name, self.gain)
+    pub fn to_stage(&self) -> LevelStage {
+        LevelStage::new(self.gain)
     }
 }

src/gui/config/noise_gate.rs

@@ -23,9 +23,8 @@ impl Default for NoiseGateConfig {
 }
 
 impl NoiseGateConfig {
-    pub fn to_stage(&self, name: &str, sample_rate: f32) -> NoiseGateStage {
+    pub fn to_stage(&self, sample_rate: f32) -> NoiseGateStage {
         NoiseGateStage::new(
-            name,
             self.threshold_db,
             self.ratio,
             self.attack_ms,

src/gui/config/poweramp.rs

@@ -19,7 +19,7 @@ impl Default for PowerAmpConfig {
 }
 
 impl PowerAmpConfig {
-    pub fn to_stage(&self, name: &str, sample_rate: f32) -> PowerAmpStage {
-        PowerAmpStage::new(name, self.drive, self.amp_type, self.sag, sample_rate)
+    pub fn to_stage(&self, sample_rate: f32) -> PowerAmpStage {
+        PowerAmpStage::new(self.drive, self.amp_type, self.sag, sample_rate)
     }
 }

src/gui/config/preamp.rs

@@ -19,7 +19,7 @@ impl Default for PreampConfig {
 }
 
 impl PreampConfig {
-    pub fn to_stage(&self, name: &str) -> PreampStage {
-        PreampStage::new(name, self.gain, self.bias, self.clipper_type)
+    pub fn to_stage(&self) -> PreampStage {
+        PreampStage::new(self.gain, self.bias, self.clipper_type)
     }
 }

src/gui/config/tonestack.rs

@@ -23,9 +23,8 @@ impl Default for ToneStackConfig {
 }
 
 impl ToneStackConfig {
-    pub fn to_stage(&self, name: &str, sample_rate: f32) -> ToneStackStage {
+    pub fn to_stage(&self, sample_rate: f32) -> ToneStackStage {
         ToneStackStage::new(
-            name,
             self.model,
             self.bass,
             self.mid,

src/sim/stages/compressor.rs

@@ -1,7 +1,6 @@
 use crate::sim::stages::Stage;
 
 pub struct CompressorStage {
-    name: String,
     attack: f32,      // Attack coefficient (0-1)
     release: f32,     // Release coefficient (0-1)
     attack_ms: f32,   // Attack time in milliseconds
@@ -20,7 +19,6 @@ fn db_to_lin(db: f32) -> f32 {
 
 impl CompressorStage {
     pub fn new(
-        name: &str,
         attack_ms: f32,
         release_ms: f32,
         threshold_db: f32,
@@ -34,7 +32,6 @@ impl CompressorStage {
         let release = (-1.0 / (sample_rate * 0.001 * release_ms)).exp();
 
         Self {
-            name: name.to_string(),
             attack,
             release,
             attack_ms,
@@ -153,8 +150,4 @@ impl Stage for CompressorStage {
             _ => Err("Unknown parameter name"),
         }
     }
-
-    fn name(&self) -> &str {
-        &self.name
-    }
 }