Add High Gain Preset (#42)

OpenSauce · web-flow · commit 6bc5d5e58557 · 2025-08-09T13:23:43.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/presets/High_Gain.json b/presets/High_Gain.json
@@ -0,0 +1,58 @@
+{
+  "name": "High Gain",
+  "description": null,
+  "author": null,
+  "stages": [
+    {
+      "Filter": {
+        "filter_type": "Highpass",
+        "cutoff_hz": 68.0,
+        "resonance": 0.2
+      }
+    },
+    {
+      "Filter": {
+        "filter_type": "Lowpass",
+        "cutoff_hz": 5737.0,
+        "resonance": 0.15
+      }
+    },
+    {
+      "Preamp": {
+        "gain": 6.7000003,
+        "bias": 0.0,
+        "clipper_type": "ClassA"
+      }
+    },
+    {
+      "ToneStack": {
+        "model": "British",
+        "bass": 0.65000004,
+        "mid": 0.90000004,
+        "treble": 0.7,
+        "presence": 0.4
+      }
+    },
+    {
+      "Compressor": {
+        "attack_ms": 1.0,
+        "release_ms": 80.0,
+        "threshold_db": -16.0,
+        "ratio": 4.0,
+        "makeup_db": 17.9
+      }
+    },
+    {
+      "Preamp": {
+        "gain": 6.8,
+        "bias": 0.0,
+        "clipper_type": "Hard"
+      }
+    },
+    {
+      "Level": {
+        "gain": 0.3
+      }
+    }
+  ]
+}
diff --git a/src/gui/app.rs b/src/gui/app.rs
@@ -11,11 +11,12 @@ use crate::sim::chain::AmplifierChain;
 pub struct AmplifierApp {
     processor_manager: ProcessorManager,
     stages: Vec<StageConfig>,
-    selected_stage_type: StageType,
     is_recording: bool,
     preset_manager: PresetManager,
     selected_preset: Option<String>,
     preset_bar: PresetBar,
+    stage_list: StageList,
+    control_bar: Control,
     new_preset_name: String,
     show_save_input: bool,
 }
@@ -43,14 +44,18 @@ impl AmplifierApp {
             Vec::new()
         };
 
+        let stage_list = StageList::new(stages.clone());
+        let control_bar = Control::new(StageType::default());
+
         let app = Self {
             processor_manager,
             stages,
-            selected_stage_type: StageType::default(),
             is_recording: false,
             preset_manager,
             selected_preset,
             preset_bar,
+            stage_list,
+            control_bar,
             new_preset_name: String::new(),
             show_save_input: false,
         };
@@ -63,33 +68,38 @@ impl AmplifierApp {
 
     pub fn update(&mut self, message: Message) -> Task<Message> {
         let mut should_update_chain = false;
+        let mut should_update_stages = false;
 
         match message {
             Message::AddStage => {
-                let new_stage = StageConfig::create_default(self.selected_stage_type);
+                let new_stage = StageConfig::create_default(self.control_bar.selected());
                 self.stages.push(new_stage);
                 should_update_chain = true;
+                should_update_stages = true;
             }
             Message::RemoveStage(idx) => {
                 if idx < self.stages.len() {
                     self.stages.remove(idx);
                 }
                 should_update_chain = true;
+                should_update_stages = true;
             }
             Message::MoveStageUp(idx) => {
                 if idx > 0 {
                     self.stages.swap(idx - 1, idx);
                     should_update_chain = true;
+                    should_update_stages = true;
                 }
             }
             Message::MoveStageDown(idx) => {
                 if idx < self.stages.len().saturating_sub(1) {
                     self.stages.swap(idx, idx + 1);
                     should_update_chain = true;
+                    should_update_stages = true;
                 }
             }
             Message::StageTypeSelected(stage_type) => {
-                self.selected_stage_type = stage_type;
+                self.control_bar.set_selected_stage_type(stage_type);
             }
             Message::PresetSelected(preset_name) => {
                 if let Some(preset) = self.preset_manager.get_preset_by_name(&preset_name) {
@@ -98,6 +108,7 @@ impl AmplifierApp {
                     self.preset_bar
                         .set_selected_preset(Some(preset_name.clone()));
                     should_update_chain = true;
+                    should_update_stages = true;
                     info!("Loaded preset: {preset_name}");
                 }
             }
@@ -205,6 +216,7 @@ impl AmplifierApp {
             Message::Stage(idx, stage_msg) => {
                 if self.update_stage(idx, stage_msg) {
                     should_update_chain = true;
+                    should_update_stages = true
                 }
             }
         }
@@ -213,6 +225,10 @@ impl AmplifierApp {
             self.update_processor_chain();
         }
 
+        if should_update_stages {
+            self.stage_list.set_stages(&self.stages);
+        }
+
         Task::none()
     }
 
@@ -308,14 +324,14 @@ impl AmplifierApp {
         self.processor_manager.set_amp_chain(chain);
     }
 
-    pub fn view(&self) -> Element<Message> {
+    pub fn view(&self) -> Element<'_, Message> {
         use iced::widget::{column, container};
 
         container(
             column![
                 self.preset_bar.view(),
-                StageList::new(&self.stages).view(),
-                Control::new(self.selected_stage_type, self.is_recording).view()
+                self.stage_list.view(),
+                self.control_bar.view(self.is_recording),
             ]
             .spacing(20)
             .padding(20),
diff --git a/src/gui/components/control.rs b/src/gui/components/control.rs
@@ -6,30 +6,32 @@ use crate::gui::messages::Message;
 
 pub struct Control {
     selected_stage_type: StageType,
-    is_recording: bool,
 }
 
+const STAGE_TYPES: &[StageType] = &[
+    StageType::Filter,
+    StageType::Preamp,
+    StageType::Compressor,
+    StageType::ToneStack,
+    StageType::PowerAmp,
+    StageType::Level,
+];
+
 impl Control {
-    pub fn new(selected_stage_type: StageType, is_recording: bool) -> Self {
+    pub fn new(selected_stage_type: StageType) -> Self {
         Self {
             selected_stage_type,
-            is_recording,
         }
     }
 
-    pub fn view(&self) -> Element<'static, Message> {
-        let stage_types = vec![
-            StageType::Filter,
-            StageType::Preamp,
-            StageType::Compressor,
-            StageType::ToneStack,
-            StageType::PowerAmp,
-            StageType::Level,
-        ];
+    pub fn set_selected_stage_type(&mut self, ty: StageType) {
+        self.selected_stage_type = ty;
+    }
 
+    pub fn view(&self, is_recording: bool) -> Element<'_, Message> {
         let stage_controls = row![
             pick_list(
-                stage_types,
+                STAGE_TYPES,
                 Some(self.selected_stage_type),
                 Message::StageTypeSelected
             ),
@@ -39,7 +41,7 @@ impl Control {
         .align_y(Alignment::Center);
 
         // Recording controls
-        let record_button = if self.is_recording {
+        let record_button = if is_recording {
             button(text("Stop Recording"))
                 .on_press(Message::StopRecording)
                 .style(iced::widget::button::danger)
@@ -49,7 +51,7 @@ impl Control {
                 .style(iced::widget::button::success)
         };
 
-        let recording_status = if self.is_recording {
+        let recording_status = if is_recording {
             text("Recording...").style(|_| iced::widget::text::Style {
                 color: Some(iced::Color::from_rgb(1.0, 0.3, 0.3)),
             })
@@ -76,4 +78,11 @@ impl Control {
         .width(Length::Fill)
         .into()
     }
+
+    pub fn set_selected(&mut self, t: StageType) {
+        self.selected_stage_type = t;
+    }
+    pub fn selected(&self) -> StageType {
+        self.selected_stage_type
+    }
 }
diff --git a/src/gui/components/stage_list.rs b/src/gui/components/stage_list.rs
@@ -5,16 +5,20 @@ use crate::gui::components::stages;
 use crate::gui::config::StageConfig;
 use crate::gui::messages::Message;
 
-pub struct StageList<'a> {
-    stages: &'a [StageConfig],
+pub struct StageList {
+    stages: Vec<StageConfig>,
 }
 
-impl<'a> StageList<'a> {
-    pub fn new(stages: &'a [StageConfig]) -> Self {
+impl StageList {
+    pub fn new(stages: Vec<StageConfig>) -> Self {
         Self { stages }
     }
 
-    pub fn view(&self) -> Element<'a, Message> {
+    pub fn set_stages(&mut self, stages: &[StageConfig]) {
+        self.stages = stages.to_vec();
+    }
+
+    pub fn view(&self) -> Element<'_, Message> {
         let mut col = column![].spacing(10).width(Length::Fill);
 
         for (idx, stage) in self.stages.iter().enumerate() {
diff --git a/src/gui/components/stages/compressor.rs b/src/gui/components/stages/compressor.rs
@@ -7,7 +7,7 @@ use crate::gui::messages::{CompressorMessage, Message, StageMessage};
 
 const HEADER_TEXT: &str = "Compressor";
 
-pub fn view(idx: usize, cfg: &CompressorConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &CompressorConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let body = column![
diff --git a/src/gui/components/stages/filter.rs b/src/gui/components/stages/filter.rs
@@ -14,7 +14,7 @@ const FILTER_TYPES: [FilterType; 4] = [
     FilterType::Notch,
 ];
 
-pub fn view(idx: usize, cfg: &FilterConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &FilterConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let type_picker = row![
diff --git a/src/gui/components/stages/level.rs b/src/gui/components/stages/level.rs
@@ -7,7 +7,7 @@ use crate::gui::messages::{LevelMessage, Message, StageMessage};
 
 const HEADER_TEXT: &str = "Level";
 
-pub fn view(idx: usize, cfg: &LevelConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &LevelConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let body = column![labeled_slider(
diff --git a/src/gui/components/stages/poweramp.rs b/src/gui/components/stages/poweramp.rs
@@ -13,7 +13,7 @@ const POWER_AMP_TYPES: [PowerAmpType; 3] = [
     PowerAmpType::ClassB,
 ];
 
-pub fn view(idx: usize, cfg: &PowerAmpConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &PowerAmpConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let type_picker = row![
diff --git a/src/gui/components/stages/preamp.rs b/src/gui/components/stages/preamp.rs
@@ -15,7 +15,7 @@ const CLIPPER_TYPES: [ClipperType; 5] = [
     ClipperType::ClassA,
 ];
 
-pub fn view(idx: usize, cfg: &PreampConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &PreampConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let clipper_picker = row![
diff --git a/src/gui/components/stages/tonestack.rs b/src/gui/components/stages/tonestack.rs
@@ -14,7 +14,7 @@ const TONE_STACK_MODELS: [ToneStackModel; 4] = [
     ToneStackModel::Flat,
 ];
 
-pub fn view(idx: usize, cfg: &ToneStackConfig, total_stages: usize) -> Element<Message> {
+pub fn view(idx: usize, cfg: &ToneStackConfig, total_stages: usize) -> Element<'_, Message> {
     let header = stage_header(HEADER_TEXT, idx, total_stages);
 
     let model_picker = row![
diff --git a/src/gui/components/widgets/common.rs b/src/gui/components/widgets/common.rs
@@ -36,7 +36,7 @@ pub fn icon_button<'a>(
     }
 }
 
-pub fn stage_header(stage_name: &str, idx: usize, total_stages: usize) -> Element<Message> {
+pub fn stage_header(stage_name: &str, idx: usize, total_stages: usize) -> Element<'_, Message> {
     let header_text = format!("{} {}", stage_name, idx + 1);
 
     let move_up_btn = if idx > 0 {
diff --git a/src/io/manager.rs b/src/io/manager.rs
@@ -83,10 +83,10 @@ impl ProcessorManager {
             error!("Failed to send recording update: {e}");
         });
 
-        if let Some(recorder) = self.recorder.take() {
-            if let Err(e) = recorder.stop() {
-                error!("Failed to stop recorder: {e}");
-            }
+        if let Some(recorder) = self.recorder.take()
+            && let Err(e) = recorder.stop()
+        {
+            error!("Failed to stop recorder: {e}");
         }
     }
 
