[*] refactoring ui

Author: heng30

Cargo.toml

@@ -99,7 +99,6 @@ crossbeam = "0.8"
 spin_sleep = "1.3"
 nnnoiseless = "0.5"
 h264-reader = "0.8"
-ffmpeg-sidecar = "2.2"
 derive_builder = "0.20"
 wayland-client = "0.31"
 fast_image_resize = "5.3"

lib/recorder/Cargo.toml

@@ -29,8 +29,6 @@ derive_setters.workspace = true
 yuv = { workspace = true, features = ["rayon"] }
 fast_image_resize = { workspace = true, features = ["rayon"] }
 
-# ffmpeg-sidecar.workspace = true
-
 [dev-dependencies]
 ctrlc.workspace = true
 env_logger.workspace = true

lib/recorder/examples/recording_10m_demo.rs

@@ -29,25 +29,23 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let config = RecorderConfig::new(
         screen_infos[0].name.clone(),
         screen_infos[0].logical_size.clone(),
-        RecorderConfig::make_filename("target"),
+        RecorderConfig::make_filename("/tmp"),
     )
     .with_enable_recording_speaker(true)
-    // .with_audio_device_name(Some(default_input.name))
+    .with_audio_device_name(Some(default_input.name))
+    .with_resolution(recorder::Resolution::Original((
+        screen_infos[0].logical_size.width as u32,
+        screen_infos[0].logical_size.height as u32,
+    )))
     .with_fps(FPS::Fps30);
-    // .with_resolution(recorder::Resolution::Original((
-    //     screen_infos[0].logical_size.width as u32,
-    //     screen_infos[0].logical_size.height as u32,
-    // )));
 
     log::debug!("Recording configuration: {:#?}", config);
 
     let mut session = RecordingSession::new(config);
 
     let stop_sig = session.get_stop_sig().clone();
-
-    // Start a timer thread that stops recording after 5 seconds
     thread::spawn(move || {
-        thread::sleep(Duration::from_secs(3600));
+        thread::sleep(Duration::from_secs(600));
         log::debug!("5 seconds elapsed, stopping recording...");
         stop_sig.store(true, Ordering::Relaxed);
     });

lib/recorder/src/recorder.rs

@@ -15,6 +15,7 @@ use mp4m::{
 use once_cell::sync::Lazy;
 use spin_sleep::SpinSleeper;
 use std::{
+    path::PathBuf,
     sync::{
         Arc, Mutex,
         atomic::{AtomicBool, AtomicU64, Ordering},
@@ -115,6 +116,22 @@ impl RecordingSession {
     }
 
     pub fn start(&mut self) -> Result<(), RecorderError> {
+        if !self
+            .config
+            .save_path
+            .parent()
+            .ok_or(RecorderError::InvalidConfig(format!(
+                "No parent directory found: {}",
+                self.config.save_path.display()
+            )))?
+            .exists()
+        {
+            return Err(RecorderError::InvalidConfig(format!(
+                "Save directory no found: {}",
+                self.config.save_path.parent().unwrap().display()
+            )));
+        }
+
         let thread_counts = self.evaluate_need_threads();
         if thread_counts == 0 {
             return Err(RecorderError::Other(format!("capture thread counts is 0")));
@@ -655,6 +672,10 @@ impl RecordingSession {
         Ok(img.convert())
     }
 
+    pub fn save_path(&self) -> PathBuf {
+        self.config.save_path.clone()
+    }
+
     pub fn stop(&self) {
         self.stop_sig.store(true, Ordering::Relaxed);
     }

wayshot/src/config.rs

@@ -120,14 +120,10 @@ pub struct Preference {
 #[from("UISettingRecorder")]
 pub struct Recorder {
     pub save_dir: String,
-    pub remove_temporary_files: bool,
 
     #[derivative(Default(value = "true"))]
     pub include_cursor: bool,
 
-    #[derivative(Default(value = "true"))]
-    pub enable_preview: bool,
-
     pub enable_denoise: bool,
 
     pub convert_to_mono: bool,
@@ -147,21 +143,21 @@ crate::impl_slint_enum_serde!(UIResolution, Original, P720, P1080, P2K, P4K);
 #[from("UISettingControl")]
 pub struct Control {
     pub screen: String,
-    pub input_audio: String,
+    pub audio: String,
 
     // db
     #[derivative(Default(value = "0.0"))]
-    pub input_audio_gain: f32,
+    pub audio_gain: f32,
 
     #[derivative(Default(value = "true"))]
-    pub enable_input_audio: bool,
+    pub enable_audio: bool,
 
     // db
     #[derivative(Default(value = "0.0"))]
-    pub desktop_speaker_gain: f32,
+    pub speaker_gain: f32,
 
     #[derivative(Default(value = "true"))]
-    pub enable_desktop_speaker: bool,
+    pub enable_speaker: bool,
 }
 
 impl Config {