[*] refactor

Author: heng30

lib/video-editor/src/export/exporter.rs

@@ -5,8 +5,10 @@ use super::{
 use crate::{
     Error, Result,
     tracks::{
-        manager::Manager, subtitle_track::apply_segment_subtitle_filters, track::Track,
-        unified_mixer::UnifiedFrame,
+        manager::Manager,
+        subtitle_track::apply_segment_subtitle_filters,
+        track::Track,
+        unified_mixer::{UnifiedFrame, UnifiedMixerConfig},
     },
 };
 use std::{
@@ -33,6 +35,8 @@ struct ExportContext {
     output_width: u32,
     output_height: u32,
     output_fps: f32,
+    audio_sample_rate: u32,
+    audio_channels: u16,
     video_encoder: Arc<Mutex<Option<Box<dyn VideoEncoder>>>>,
     video_stream_index: usize,
     audio_stream_index: Option<usize>,
@@ -182,6 +186,8 @@ impl Mp4Exporter {
                 output_width,
                 output_height,
                 output_fps,
+                audio_sample_rate,
+                audio_channels,
                 video_encoder,
                 video_stream_index,
                 audio_stream_index,
@@ -208,13 +214,16 @@ impl Mp4Exporter {
         let cache_duration = Duration::from_secs(5);
         let max_cache_duration = Duration::from_secs(20);
 
-        let mixer_iter = self.manager.unified_tracks_mixer_iter(
-            Duration::ZERO,
-            cache_duration,
-            max_cache_duration,
-            Some(ctx.output_width),
-            Some(ctx.output_height),
-            Some(ctx.output_fps),
+        let mixer_iter = self.manager.unified_tracks_mixer_iter_with_config(
+            UnifiedMixerConfig::default()
+                .with_timeline_offset(Duration::ZERO)
+                .with_cache_duration(cache_duration)
+                .with_max_cache_duration(max_cache_duration)
+                .with_output_width(Some(ctx.output_width))
+                .with_output_height(Some(ctx.output_height))
+                .with_output_fps(Some(ctx.output_fps))
+                .with_output_channels(Some(ctx.audio_channels))
+                .with_output_sample_rate(Some(ctx.audio_sample_rate)),
         )?;
 
         let mut frames_processed = 0u64;

todo.md

@@ -1,9 +1,8 @@
 ## 问题
-- 联动所有轨道时，移动所有轨道上的segment，非鼠标下控制移动的segment可能为0
 
 ## 待验证
 
 - 视频轨道分离字幕
 
 ## 待实现功能
-
+- library和playlist的条目预览弹窗

wayshot/ui/panel/desktop/home.slint

@@ -8,27 +8,27 @@ import { VideoEditor } from "video-editor/video-editor.slint";
 import { Logic } from "../../logic.slint";
 
 export component Home inherits VerticalLayout {
-    // if Store.current-tab-index == TabIndex.Home: MainPanel {
-    //     height: parent.height;
-    //
-    //     init => {
-    //         Logic.startup-recorder-init();
-    //     }
-    // }
-    //
-    // if Store.current-tab-index == TabIndex.History: HistoryPanel {
-    //     init => {
-    //         Logic.startup-recorder-init();
-    //     }
-    // }
-    //
-    // if Store.current-tab-index == TabIndex.Player: PlayerPanel {
-    //     height: parent.height;
-    //
-    //     init => {
-    //         Logic.startup-recorder-init();
-    //     }
-    // }
+    if Store.current-tab-index == TabIndex.Home: MainPanel {
+        height: parent.height;
+
+        init => {
+            Logic.startup-recorder-init();
+        }
+    }
+
+    if Store.current-tab-index == TabIndex.History: HistoryPanel {
+        init => {
+            Logic.startup-recorder-init();
+        }
+    }
+
+    if Store.current-tab-index == TabIndex.Player: PlayerPanel {
+        height: parent.height;
+
+        init => {
+            Logic.startup-recorder-init();
+        }
+    }
 
     if Store.current-tab-index == TabIndex.VideoEditor: VideoEditor {
         height: parent.height;
@@ -38,20 +38,20 @@ export component Home inherits VerticalLayout {
         }
     }
 
-    // if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
-    //     height: parent.height;
-    //
-    //     init => {
-    //         Logic.startup-transcribe-init();
-    //     }
-    // }
-    //
-    // if Store.current-tab-index == TabIndex.ShareScreen: ShareScreenPanel {
-    //     width: parent.width;
-    //     height: parent.height;
-    //
-    //     init => {
-    //         Logic.startup-share-screen-init();
-    //     }
-    // }
+    if Store.current-tab-index == TabIndex.Transcribe: TranscribePanel {
+        height: parent.height;
+
+        init => {
+            Logic.startup-transcribe-init();
+        }
+    }
+
+    if Store.current-tab-index == TabIndex.ShareScreen: ShareScreenPanel {
+        width: parent.width;
+        height: parent.height;
+
+        init => {
+            Logic.startup-share-screen-init();
+        }
+    }
 }

wayshot/ui/panel/desktop/transcribe/list-item.slint

@@ -190,6 +190,7 @@ export component SubtitleListItem inherits Rectangle {
 
         subtitle-vbox := VerticalLayout {
             padding: Theme.padding * 2;
+            padding-top: 0;
             spacing: entry.correction-text.is-empty ? 0 : Theme.spacing * 2;
 
             HorizontalLayout {
@@ -202,6 +203,7 @@ export component SubtitleListItem inherits Rectangle {
                     wrap: word-wrap;
                     text-color: Theme.primary-text-color;
                     allow-breaking-text-binding-when-edit: false;
+                    font-size: Theme.default-font-size + 2px;
 
                     accepted(text) => {
                         self.is-edit = false;
@@ -239,6 +241,7 @@ export component SubtitleListItem inherits Rectangle {
 
                         Label {
                             text: entry.correction-text;
+                            font-size: Theme.default-font-size + 2px;
                             wrap: word-wrap;
                         }
                     }