[*] refactor

Author: heng30

todo.md

@@ -1,5 +1,5 @@
 ## 问题
-- 添加音频轨道时，音频文件稍微大一点，轨道就没法及时更新ui waveform显示。添加另外一条音频轨道或滤镜或移动轨道，才显示处轨道上的ui waveform
+
 
 ## 待验证
 

wayshot/src/logic.rs

@@ -40,7 +40,8 @@ pub fn init(ui: &AppWindow) {
     popup_action::init(ui);
 
     downloader::init(ui);
-    transcribe::startup_init(ui);
+    transcribe::app_launch_init(ui);
+    video_editor::app_launch_init(ui);
 
     logic_cb!(startup_recorder_init, ui);
     logic_cb!(startup_video_editor_init, ui);

wayshot/src/logic/transcribe.rs

@@ -2,7 +2,7 @@ mod audio_player;
 mod downloader;
 mod model;
 
-pub use model::startup_init;
+pub use model::app_launch_init;
 
 pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     model::init(ui);

wayshot/src/logic/transcribe/model.rs

@@ -104,7 +104,7 @@ pub fn init(ui: &AppWindow) {
     logic_cb!(transcribe_subtitle_remove, ui, index);
 }
 
-pub fn startup_init(ui: &AppWindow) {
+pub fn app_launch_init(ui: &AppWindow) {
     logic_cb!(file_exist, ui, file);
     logic_cb!(is_valid_subtitle_timestamp, ui, timestamp);
     logic_cb!(ms_to_srt_timestamp_ui, ui, ms);

wayshot/src/logic/video_editor.rs

@@ -25,5 +25,8 @@ pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     subtitle::init(ui);
     preview::init(ui);
     record_audio::init(ui);
+}
+
+pub fn app_launch_init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     font::init(ui);
 }

wayshot/src/logic/video_editor/conversion.rs

@@ -266,23 +266,10 @@ impl From<Arc<Segment>> for UIVideoEditorTrackSegment {
             .audio_samples
             .as_ref()
             .map(|audio| {
-                // NOTE: 注释的代码是为了让声音很小的音频也能够在ui上显示出来，但是这样会使展示失真
-                // let peak = audio
-                //     .samples
-                //     .iter()
-                //     .fold(0.0f32, |max, &s| max.max(s.abs()));
-                //
-                // let scale = if peak > 0.0 && peak < 0.1 {
-                //     0.5 / peak
-                // } else {
-                //     1.0
-                // };
-
-                let scale = 1.0;
                 (
                     audio.channels as i32,
                     ModelRc::new(VecModel::from_slice(&audio.samples)),
-                    scale,
+                    1.0,
                 )
             })
             .unwrap_or((0, ModelRc::new(VecModel::default()), 1.0));

wayshot/src/logic/video_editor/font.rs

@@ -26,7 +26,7 @@ macro_rules! store_font_entries {
 }
 
 pub fn init(ui: &AppWindow) {
-    store_font_entries!(ui).set_vec(vec![]);
+    inner_int(ui);
 
     logic_cb!(init_font_dialog, ui);
     logic_cb!(refresh_font_entries, ui);
@@ -35,6 +35,15 @@ pub fn init(ui: &AppWindow) {
     logic_cb!(toggle_font_marked, ui, index);
 }
 
+pub fn inner_int(ui: &AppWindow) {
+    let ui_weak = ui.as_weak();
+    store_font_entries!(ui).set_vec(vec![]);
+
+    tokio::spawn(async move {
+        refresh_font_entries_impl(ui_weak).await;
+    });
+}
+
 fn init_font_dialog(ui: &AppWindow) {
     let ui_weak = ui.as_weak();
     tokio::spawn(async move {

wayshot/src/logic/video_editor/record_audio.rs

@@ -247,14 +247,14 @@ fn video_editor_stop_recording_audio(ui: &AppWindow) {
             return;
         };
 
-        if config.gain != 0.0 {
-            audio.apply_gain(config.gain);
-        }
-
         if config.mono {
             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/src/logic/video_editor/segment.rs

@@ -505,7 +505,7 @@ pub fn async_load_segment_audio(
         };
 
         let (channels, audio_samples) =
-            seg.audio_resampling_for_display((seg.duration.as_secs_f64() * 15.0).ceil() as u32);
+            seg.audio_resampling_for_display((seg.duration.as_secs_f64() * 30.0).ceil() as u32);
 
         log::debug!(
             "segment[{uuid}]: load {} audio samples",

wayshot/ui/panel/desktop/font-dialog.slint

@@ -17,10 +17,20 @@ import {
 } from "../../base/widgets.slint";
 
 component HeadBar inherits HorizontalLayout {
-    alignment: end;
+    alignment: space-between;
 
     private property <bool> show-search-bar;
 
+    VerticalLayout {
+        alignment: center;
+        padding-left: Theme.padding * 4;
+
+        Label {
+            text: Logic.tr("Font: ") + Store.font-entries.length;
+            font-size: Theme.title3-font-size;
+        }
+    }
+
     Rectangle {
         width: hbox.preferred-width;
         border-radius: self.height / 2;