[*] refactor

Author: heng30

lib/record-audio/src/lib.rs

@@ -120,6 +120,7 @@ pub struct AudioRecorder {
     recorded_samples: Arc<Mutex<Vec<f32>>>,
     channels: u16,
     sample_rate: u32,
+    gain_db: f32,
 }
 
 impl Default for AudioRecorder {
@@ -138,6 +139,7 @@ impl AudioRecorder {
             recorded_samples: Arc::new(Mutex::new(Vec::new())),
             channels: 2,
             sample_rate: 48000,
+            gain_db: 0.0,
         }
     }
 
@@ -146,6 +148,11 @@ impl AudioRecorder {
         self
     }
 
+    pub fn with_gain(mut self, gain_db: f32) -> Self {
+        self.gain_db = gain_db;
+        self
+    }
+
     pub fn get_input_devices(&self) -> Result<Vec<AudioDeviceInfo>> {
         let devices = self
             .host
@@ -208,6 +215,12 @@ impl AudioRecorder {
         let level_sender = self.level_sender.clone();
         let channels = self.channels;
 
+        let linear_gain = if self.gain_db == 0.0 {
+            1.0
+        } else {
+            10.0_f32.powf(self.gain_db / 20.0)
+        };
+
         // Buffer for level calculation
         let level_buffer: Arc<Mutex<Vec<f32>>> = Arc::new(Mutex::new(Vec::new()));
         let level_buffer_clone = level_buffer.clone();
@@ -216,14 +229,19 @@ impl AudioRecorder {
             .build_input_stream(
                 &config,
                 move |data: &[f32], _: &cpal::InputCallbackInfo| {
+                    let gain_samples: Vec<f32> = data
+                        .iter()
+                        .map(|s| (s * linear_gain).clamp(-1.0, 1.0))
+                        .collect();
+
                     if let Ok(mut s) = samples.lock() {
-                        s.extend_from_slice(data);
+                        s.extend_from_slice(&gain_samples);
                     }
 
                     if let Some(sender) = &level_sender
                         && let Ok(mut buf) = level_buffer_clone.lock()
                     {
-                        buf.extend_from_slice(data);
+                        buf.extend_from_slice(&gain_samples);
 
                         // Calculate and send level every ~100ms worth of samples
                         let threshold = (config.sample_rate as usize / 10) * channels as usize;

wayshot/src/logic/video_editor/record_audio.rs

@@ -100,6 +100,7 @@ fn video_editor_start_recording_audio(ui: &AppWindow) {
     let config = global_store!(ui).get_video_editor_record_audio_config();
     let save_dir = config.save_dir.to_string();
     let device = config.device.to_string();
+    let gain = config.gain;
 
     if save_dir.is_empty() {
         crate::toast_warn!(ui, tr("Please select a save directory first"));
@@ -120,7 +121,9 @@ fn video_editor_start_recording_audio(ui: &AppWindow) {
         };
 
         let (sender, receiver) = channel::bounded::<(f32, f32)>(32);
-        let recorder = AudioRecorder::new().with_level_sender(sender.clone());
+        let recorder = AudioRecorder::new()
+            .with_level_sender(sender.clone())
+            .with_gain(gain);
 
         {
             let mut state = RECORD_AUDIO_STATE.lock().unwrap();
@@ -251,10 +254,6 @@ fn video_editor_stop_recording_audio(ui: &AppWindow) {
             audio.convert_to_mono();
         }
 
-        if config.gain != 0.0 {
-            audio.apply_gain(config.gain);
-        }
-
         let timestamp = chrono::Local::now().format("%Y%m%d_%H%M%S");
         let filename = format!("recording_{}.wav", timestamp);
         let save_path = PathBuf::from(&save_dir).join(&filename);

wayshot/ui/base/label.slint

@@ -1,8 +1,10 @@
 import { Theme } from "theme.slint";
 
 export component Label inherits Text {
+    in-out property <bool> enabled: true;
+
     vertical-alignment: center;
-    color: Theme.primary-text-color;
+    color: enabled ? Theme.primary-text-color : Theme.disabled-color;
     font-size: Theme.default-font-size;
     font-family: Theme.default-font-family;
 }

wayshot/ui/base/select.slint

@@ -35,7 +35,7 @@ export component Select inherits Rectangle {
     height: hbox.preferred-height;
     background: Theme.secondary-background;
     border-radius: Theme.border-radius;
-    border-width: fs.has-focus ? 2px : 0;
+    border-width: fs.has-focus && root.enabled ? 2px : 0;
     border-color: Theme.focus-color;
 
     callback selected(current-index: int, current-value: string);
@@ -53,6 +53,7 @@ export component Select inherits Rectangle {
         spacing: Theme.spacing * 2;
 
         lb := Label {
+            enabled: root.enabled;
             text: root.current-value;
             font-size: root.font-size;
             overflow: elide;
@@ -66,9 +67,12 @@ export component Select inherits Rectangle {
         }
     }
 
-    fs := FocusScope { }
+    fs := FocusScope {
+        enabled: root.enabled;
+    }
 
     ta := TouchArea {
+        enabled: root.enabled;
         mouse-cursor: MouseCursor.pointer;
         clicked => {
             is-indicator-down = false;

wayshot/ui/panel/desktop/video-editor/preview/preview.slint

@@ -193,10 +193,15 @@ component PreviewWindow inherits Rectangle {
     background: Theme.thirdly-background;
 
     private property <bool> show-volume-indicator;
+    private property <bool> no-show-volume-indeicator: true;
     private property <float> width-height-rate: self.width / self.height;
     private property preview-volume <=> Store.video-editor-ui-state.preview-volume;
 
     changed preview-volume => {
+        if (no-show-volume-indeicator) {
+            no-show-volume-indeicator = false;
+            return;
+        }
         root.show-volume-indicator = true;
     }
 

wayshot/ui/panel/desktop/video-editor/record-audio-dialog.slint

@@ -43,13 +43,15 @@ export component RecordAudioDialog inherits MovingDialog {
             text: cache-config.save-dir;
             vpadding: Theme.padding;
             placeholder-text: Logic.tr("Please select a save directory");
+            enabled: !Store.video-editor-is-recording-audio;
 
             clicked => {
                 Logic.video-editor-record-audio-select-dir();
             }
         }
 
         Select {
+            enabled: !Store.video-editor-is-recording-audio;
             vpadding: Theme.padding;
             values: Store.video-editor-audio-devices;
             current-value: cache-config.device.is-empty ? Logic.tr("Please select a input device") : cache-config.device;
@@ -69,12 +71,14 @@ export component RecordAudioDialog inherits MovingDialog {
                 Label {
                     text: Logic.tr("Gain (dB):");
                     vertical-alignment: center;
+                    enabled: !Store.video-editor-is-recording-audio;
                 }
 
                 LineInput {
                     input-type: InputType.decimal;
                     text: cache-config.gain.to-fixed(2);
                     vpadding: Theme.padding / 2;
+                    enabled: !Store.video-editor-is-recording-audio;
 
                     accepted => {
                         cache-config.gain = self.text.to-float();
@@ -86,6 +90,7 @@ export component RecordAudioDialog inherits MovingDialog {
             CheckBtn {
                 text: Logic.tr("Mono");
                 checked: cache-config.mono;
+                enabled: !Store.video-editor-is-recording-audio;
 
                 toggled => {
                     cache-config.mono = self.checked;
@@ -102,11 +107,14 @@ export component RecordAudioDialog inherits MovingDialog {
 
                 HorizontalLayout {
                     spacing: Theme.spacing;
+                    alignment: start;
 
                     Label {
                         text: "L";
+                        width: Theme.default-font-size;
                         vertical-alignment: center;
                         font-size: Theme.default-font-size * 0.8;
+                        enabled: !Store.video-editor-is-recording-audio;
                     }
 
                     AudioLevel {
@@ -116,10 +124,14 @@ export component RecordAudioDialog inherits MovingDialog {
 
                 HorizontalLayout {
                     spacing: Theme.spacing;
+                    alignment: start;
+
                     Label {
                         text: "R";
+                        width: Theme.default-font-size;
                         vertical-alignment: center;
                         font-size: Theme.default-font-size * 0.8;
+                        enabled: !Store.video-editor-is-recording-audio;
                     }
 
                     AudioLevel {