[*] update normally

Author: heng30

lib/recorder/examples/input_recording_demo.rs

@@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         input_filename
     );
 
-    let streaming_recorder = StreamingAudioRecorder::start_recording_to_file(
+    let streaming_recorder = StreamingAudioRecorder::start(
         recorder,
         "default", // 使用默认输入设备
         input_filename,

lib/recorder/src/record_audio.rs

@@ -9,7 +9,10 @@ use std::{
     fs::File,
     io::BufWriter,
     path::Path,
-    sync::{Arc, Mutex},
+    sync::{
+        Arc, Mutex,
+        atomic::{AtomicI32, Ordering},
+    },
 };
 use thiserror::Error;
 
@@ -179,6 +182,9 @@ pub struct AudioRecorder {
     audio_level_sender: Option<Arc<Sender<f32>>>,
     /// Optional receiver for audio level data (if monitoring enabled)
     audio_level_receiver: Option<Arc<Receiver<f32>>>,
+
+    // [0, infinity]
+    amplification: Option<Arc<AtomicI32>>,
 }
 
 impl AudioRecorder {
@@ -221,9 +227,15 @@ impl AudioRecorder {
 
             audio_level_sender,
             audio_level_receiver,
+            amplification: None,
         })
     }
 
+    pub fn with_amplification(mut self, v: Arc<AtomicI32>) -> Self {
+        self.amplification = Some(v);
+        self
+    }
+
     /// Get the audio level receiver for real-time monitoring.
     ///
     /// This method returns the receiver end of the audio level channel,
@@ -526,7 +538,7 @@ pub struct StreamingAudioRecorder {
 
 impl StreamingAudioRecorder {
     /// Start recording audio to a file
-    pub fn start_recording_to_file<P: AsRef<Path>>(
+    pub fn start<P: AsRef<Path>>(
         recorder: AudioRecorder,
         device_name: &str,
         file_path: P,
@@ -546,8 +558,22 @@ impl StreamingAudioRecorder {
 
         let file_writer_clone = file_writer.clone();
         let audio_level_sender = recorder.audio_level_sender.clone();
-        let recording_session =
-            recorder.start_input_recording(device_name, move |data: &[f32], _info: &_| {
+        let amplification = recorder.amplification.clone();
+        let recording_session = recorder.start_input_recording(
+            device_name,
+            move |f32_samples: &[f32], _info: &_| {
+                let mut f32_sample_amplification = vec![0.0; f32_samples.len()];
+                let data = if let Some(ref amplification) = amplification {
+                    for (index, v) in f32_samples.iter().enumerate() {
+                        f32_sample_amplification[index] =
+                            v * (amplification.load(Ordering::Relaxed) as f32 / 100.0);
+                    }
+
+                    &f32_sample_amplification[..]
+                } else {
+                    f32_samples
+                };
+
                 if let Some(ref tx) = audio_level_sender
                     && let Some(db) = calc_rms_level(data)
                     && let Err(e) = tx.try_send(db)
@@ -560,7 +586,8 @@ impl StreamingAudioRecorder {
                 {
                     _ = writer.write_samples(data);
                 }
-            })?;
+            },
+        )?;
 
         Ok(Self {
             file_writer: file_writer,

lib/recorder/src/record_speaker.rs

@@ -11,7 +11,6 @@ use pipewire::{
     stream::{StreamBox, StreamFlags, StreamListener},
 };
 use std::{
-    ops::Mul,
     path::PathBuf,
     sync::{
         Arc, Mutex,
@@ -411,7 +410,7 @@ impl SpeakerRecorder {
                     let f32_samples = if let Some(ref amplification) = amplification {
                         for (index, v) in f32_samples.iter().enumerate() {
                             f32_sample_amplification[index] =
-                                v.mul(amplification.load(Ordering::Relaxed) as f32 / 100.0);
+                                v * (amplification.load(Ordering::Relaxed) as f32 / 100.0);
                         }
 
                         &f32_sample_amplification[..]

lib/recorder/src/recorder.rs

@@ -392,7 +392,7 @@ impl RecordingSession {
             .output_path
             .with_extension(INPUT_AUDIO_EXTENSION);
 
-        let streaming_recorder = StreamingAudioRecorder::start_recording_to_file(
+        let streaming_recorder = StreamingAudioRecorder::start(
             audio_recorder,
             device_name,
             audio_file_path,

wayshot/src/config.rs

@@ -122,6 +122,9 @@ pub struct Recorder {
     pub save_dir: String,
     pub remove_temporary_files: bool,
 
+    #[derivative(Default(value = "true"))]
+    pub show_cursor: bool,
+
     #[derivative(Default(value = "fps_default()"))]
     pub fps: UIFps,
 

wayshot/src/logic/recorder.rs

@@ -10,7 +10,7 @@ use crate::{
 };
 use anyhow::{Result, bail};
 use once_cell::sync::Lazy;
-use recorder::{AudioRecorder, SpeakerRecorder, bounded};
+use recorder::{AudioRecorder, SpeakerRecorder, StreamingAudioRecorder, bounded};
 use slint::{ComponentHandle, Model, SharedString, ToSharedString, VecModel, Weak};
 use std::{
     path::PathBuf,
@@ -25,6 +25,7 @@ use std::{
 struct Cache {
     desktop_speaker_amplification: Option<Arc<AtomicI32>>,
     input_audio_amplification: Option<Arc<AtomicI32>>,
+    input_streaming_audio_recorder: Option<StreamingAudioRecorder>,
 }
 
 static CACHE: Lazy<Mutex<Cache>> = Lazy::new(|| Mutex::new(Cache::default()));
@@ -113,6 +114,10 @@ fn init_input_audio(ui: &AppWindow) -> Result<()> {
 
     store_audio_sources!(ui).set_vec(names.clone());
 
+    if names.is_empty() {
+        bail!("available input device no found");
+    }
+
     let control_config = config::all().control;
     if control_config.input_audio.is_empty()
         || names
@@ -134,7 +139,7 @@ fn init_input_audio(ui: &AppWindow) -> Result<()> {
             global_store!(ui).set_setting_control(control_setting.clone());
             global_logic!(ui).invoke_set_setting_control(control_setting);
         } else {
-            log::warn!("No default input device found");
+            bail!("Default input device no found");
         }
     }
 
@@ -144,7 +149,7 @@ fn init_input_audio(ui: &AppWindow) -> Result<()> {
         name: name.clone(),
     });
 
-    global_logic!(ui).invoke_input_audio_changed(name);
+    input_audio_changed(&ui, name);
 
     Ok(())
 }
@@ -224,6 +229,10 @@ fn init_video(ui: &AppWindow) -> Result<()> {
 
     store_video_sources!(ui).set_vec(names.clone());
 
+    if names.is_empty() {
+        bail!("available screens no found");
+    }
+
     let control_config = config::all().control;
     if control_config.screen.is_empty()
         || names
@@ -262,7 +271,14 @@ fn choose_save_dir(ui: &AppWindow) {
     });
 }
 
-fn input_audio_amplification_changed(ui: &AppWindow, v: f32) {}
+fn input_audio_amplification_changed(_ui: &AppWindow, v: f32) {
+    let amplification = CACHE.lock().unwrap().input_audio_amplification.clone();
+    if let Some(amplification) = amplification {
+        amplification.store(v as i32, Ordering::Relaxed);
+    } else {
+        log::warn!("input audio amplification is None");
+    }
+}
 
 fn desktop_speaker_amplification_changed(_ui: &AppWindow, v: f32) {
     let amplification = CACHE.lock().unwrap().desktop_speaker_amplification.clone();
@@ -273,7 +289,42 @@ fn desktop_speaker_amplification_changed(_ui: &AppWindow, v: f32) {
     }
 }
 
-fn input_audio_changed(ui: &AppWindow, name: SharedString) {}
+fn input_audio_changed(ui: &AppWindow, name: SharedString) {
+    if let Err(e) = inner_input_audio_changed(ui, name) {
+        toast_warn!(ui, format!("{e}"));
+    }
+}
+
+fn inner_input_audio_changed(ui: &AppWindow, name: SharedString) -> Result<()> {
+    let amplification = Arc::new(AtomicI32::new(
+        config::all().control.input_audio_sound.max(0.0) as i32,
+    ));
+
+    let recorder = AudioRecorder::new(Some(1024))?.with_amplification(amplification.clone());
+    let streaming_recorder = StreamingAudioRecorder::start(recorder, &name, PathBuf::new(), true)?;
+
+    let receiver = streaming_recorder.get_audio_level_receiver();
+
+    {
+        let mut cache = CACHE.lock().unwrap();
+        cache.input_audio_amplification = Some(amplification);
+        cache.input_streaming_audio_recorder = Some(streaming_recorder);
+    }
+
+    if let Some(receiver) = receiver {
+        let ui_weak = ui.as_weak();
+        thread::spawn(move || {
+            while let Ok(db) = receiver.recv() {
+                // log::debug!("input_audio_level_receiver db level: {db:.0}",);
+                _ = ui_weak.upgrade_in_event_loop(move |ui| {
+                    global_store!(ui).set_input_audio_db(db as i32);
+                });
+            }
+        });
+    }
+
+    Ok(())
+}
 
 fn start_recording(ui: &AppWindow) {}
 

wayshot/ui/base/icon.slint

@@ -235,6 +235,7 @@ export global Icons {
     out property <image> monitor-recorder-fill: @image-url("../images/icons/monitor-recorder-fill.svg");
     out property <image> monitor-recorder-light: @image-url("../images/icons/monitor-recorder-light.svg");
     out property <image> clear-fill: @image-url("../images/icons/clear-fill.svg");
+    out property <image> cursor-light: @image-url("../images/icons/cursor-light.svg");
 
     out property <image> landing-account: @image-url("../images/landing/landing-account.svg");
     out property <image> landing-language-switch: @image-url("../images/landing/landing-language-switch.svg");

wayshot/ui/images/icons/cursor-light.svg

@@ -75,7 +75,7 @@ export global Logic {
     callback set-setting-control(setting: SettingControl);
 
     callback choose-save-dir();
-    callback input-audio-changed(value: string);
+    callback input-audio-changed(name: string);
     callback input-audio-amplification-changed(value: float);
     callback desktop-speaker-amplification-changed(value: float);
     callback start-recording();

wayshot/ui/logic.slint

@@ -215,7 +215,7 @@ component ControlPanel inherits HorizontalLayout {
                             input-audio-slider := Slider {
                                 value: Store.setting-control.input-audio-sound;
                                 minimum: 0;
-                                maximum: 200;
+                                maximum: 100;
                                 indicator-size: self.has-hover ? Theme.icon-size * 2 / 3 : 0;
                                 height: Theme.icon-size / 3;
                                 width: root.slider-width;
@@ -284,7 +284,7 @@ component ControlPanel inherits HorizontalLayout {
                             desktop-speaker-slider := Slider {
                                 value: Store.setting-control.desktop-speaker-sound;
                                 minimum: 0;
-                                maximum: 200;
+                                maximum: 100;
                                 indicator-size: self.has-hover ? Theme.icon-size * 2 / 3 : 0;
                                 width: root.slider-width;