[*] refactor: video-editor

Author: heng30

lib/record-audio/src/lib.rs

@@ -283,8 +283,8 @@ impl AudioRecorder {
             .map_err(|e| AudioRecorderError::StreamCreation(e.to_string()))?;
 
         for device in devices {
-            if let Ok(desc) = device.description()
-                && desc.name() == name
+            if let Ok(id) = device.id()
+                && id.to_string() == name
             {
                 let supported_config = device
                     .default_input_config()

todo.md

@@ -3,8 +3,6 @@
 
 ## 待验证
 - 视频轨道分离字幕
-- 添加录音功能，录音文件需要添加到playlist中。录音UI可以选择设备和保存目录
-
 
 ## 待实现功能
 - playlist和library支持编辑移除

wayshot/src/logic/video_editor/command.rs

@@ -5,10 +5,7 @@ use super::{
 };
 use crate::{
     global_store, logic_cb,
-    slint_generatedAppWindow::{
-        AppWindow, SelectedSegmentIndex as UISelectedSegmentIndex,
-        VideoEditorTracksManager as UIVideoEditorTracksManager,
-    },
+    slint_generatedAppWindow::{AppWindow, SelectedSegmentIndex as UISelectedSegmentIndex},
 };
 use slint::{ComponentHandle, Model, VecModel};
 use std::{
@@ -542,14 +539,21 @@ fn get_selected_segments(ui: &AppWindow) -> Vec<ClipboardSegment> {
 }
 
 pub fn sync_manager_to_ui(ui: &AppWindow) {
-    let ui_manager: UIVideoEditorTracksManager = with_history_manager(|state| {
+    let (new_duration, ui_manager) = with_history_manager(|state| {
         if let Some(ref autosave) = state.autosave_manager {
             autosave.mark_dirty();
         }
 
-        state.tracks_manager.clone().into()
+        let manager = state.tracks_manager.clone();
+        (manager.duration, manager.into())
     });
 
+    let current_offset = global_store!(ui).get_video_editor_timeline_offset();
+    let new_offset_ms = new_duration.as_millis() as i32;
+    if current_offset > new_offset_ms {
+        global_store!(ui).set_video_editor_timeline_offset(new_offset_ms);
+    }
+
     global_store!(ui).set_video_editor_tracks_manager(ui_manager);
     global_store!(ui).set_video_editor_is_unsaved(true);
 }

wayshot/src/logic/video_editor/playlist.rs

@@ -153,18 +153,20 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
                     }
                 };
 
-            let (segment_index, segment_uuid, inserted_track_index) =
-                if let Some(track_index) = created_track_index {
-                    let track = tracks_manager
-                        .get(track_index)
-                        .expect("already crate a new track");
-                    let segment = track
-                        .segments()
-                        .first()
-                        .expect("already add segment to the track");
-                    (0, segment.uuid.clone(), track_index)
-                } else {
-                    let track_index = current_track_index.max(0) as usize;
+            let (segment_index, segment_uuid, inserted_track_index) = if let Some(track_index) =
+                created_track_index
+            {
+                let track = tracks_manager
+                    .get(track_index)
+                    .expect("already crate a new track");
+                let segment = track
+                    .segments()
+                    .first()
+                    .expect("already add segment to the track");
+                (0, segment.uuid.clone(), track_index)
+            } else {
+                let track_index = current_track_index.max(0) as usize;
+                let (segment_index, segment_uuid) = {
                     let Some(track) = tracks_manager.get_mut(track_index) else {
                         crate::toast_warn!(ui, "Already found the edited track. But no found");
                         return;
@@ -183,8 +185,11 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
                     ));
                     track.add_segment(segment.clone());
                     let segment_index = track.segments_count() - 1;
-                    (segment_index, segment.uuid.clone(), track_index)
+                    (segment_index, segment.uuid.clone())
                 };
+                tracks_manager.update_duration();
+                (segment_index, segment_uuid, track_index)
+            };
 
             {
                 let mut state = PROJECT_STATE.lock().unwrap();

wayshot/src/logic/video_editor/segment.rs

@@ -40,6 +40,7 @@ macro_rules! store_video_editor_tracks_manager_track_segment {
 
 pub fn init(ui: &AppWindow) {
     logic_cb!(video_editor_add_selected_segment, ui, index);
+    logic_cb!(video_editor_select_all_segments, ui);
     logic_cb!(video_editor_remove_segments, ui);
     logic_cb!(video_editor_linked_remove_segments, ui);
     logic_cb!(video_editor_split_segment, ui);
@@ -133,6 +134,33 @@ fn video_editor_add_selected_segment(ui: &AppWindow, index: UISelectedSegmentInd
     store_video_editor_selected_segments_index!(ui).set_vec(selected_indices);
 }
 
+fn video_editor_select_all_segments(ui: &AppWindow) {
+    let all_segments: Vec<UISelectedSegmentIndex> = with_history_manager(|state| {
+        let mut result = Vec::new();
+
+        for (track_idx, track) in state.tracks_manager.iter().enumerate() {
+            let segments_len = match track {
+                Track::Video(inner) => inner.track.segments.len(),
+                Track::Audio(inner) => inner.track.segments.len(),
+                Track::Subtitle(inner) => inner.track.segments.len(),
+                Track::Overlay(inner) => inner.track.segments.len(),
+            };
+
+            for seg_idx in 0..segments_len {
+                result.push(UISelectedSegmentIndex {
+                    track_index: track_idx as i32,
+                    index: seg_idx as i32,
+                    modifiers: Default::default(),
+                });
+            }
+        }
+
+        result
+    });
+
+    store_video_editor_selected_segments_index!(ui).set_vec(all_segments);
+}
+
 fn video_editor_is_selected_segment(
     _ui: &AppWindow,
     selected_segment: ModelRc<UISelectedSegmentIndex>,

wayshot/ui/logic.slint

@@ -330,6 +330,7 @@ export global Logic {
     pure callback video-editor-is-selected-track(selected-tracks: [SelectedTrackIndex], index: int, _falg: bool) -> bool;
 
     callback video-editor-add-selected-segment(index: SelectedSegmentIndex);
+    callback video-editor-select-all-segments();
     callback video-editor-remove-segments();
     callback video-editor-linked-remove-segments();
     callback video-editor-split-segment();

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

@@ -26,6 +26,11 @@ export component RecordAudioDialog inherits MovingDialog {
     private property record-duration <=> Store.video-editor-record-audio-duration;
     private property <VideoEditorRecordAudioConfig> cache-config <=> Store.video-editor-record-audio-config;
 
+    public function stop() {
+        record-duration = 0;
+        Logic.video-editor-stop-recording-audio();
+    }
+
     out-vbox := VerticalLayout {
         padding: Theme.padding * 2;
         spacing: Theme.spacing * 4;
@@ -84,8 +89,7 @@ export component RecordAudioDialog inherits MovingDialog {
                     width: vbox.preferred-height;
 
                     clicked => {
-                        record-duration = 0;
-                        Logic.video-editor-stop-recording-audio();
+                        root.stop();
                     }
                 }
             }

wayshot/ui/panel/desktop/video-editor/tracks/timeline.slint

@@ -51,20 +51,25 @@ export component Timeline inherits Rectangle {
     background: Theme.table-item-second;
 
     HorizontalLayout {
-        HorizontalLayout {
-            padding-left: Theme.padding * 2;
+        Rectangle {
             width: header-width;
+            HorizontalLayout {
+                alignment: start;
+                padding-left: Theme.padding * 2;
 
-            ouput-lb := Label {
-                text: Logic.tr("Tracks");
-            }
+                ouput-lb := Label {
+                    text: Logic.tr("Tracks");
+                }
 
-            Label {
-                text: "(" + Store.video-editor-tracks-manager.tracks.length + ")";
-                color: Theme.placeholder-text-color;
+                Label {
+                    text: "(" + Store.video-editor-tracks-manager.tracks.length + ")";
+                    color: Theme.placeholder-text-color;
+                }
             }
 
             TouchArea {
+                mouse-cursor: MouseCursor.pointer;
+
                 clicked => {
                     Logic.video-editor-select-all-tracks();
                 }

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

@@ -132,6 +132,8 @@ export component VideoEditor inherits Rectangle {
                     } else if (event.text == "l") {
                         Store.video-editor-ui-state.enabled-link-track = !Store.video-editor-ui-state.enabled-link-track;
                         Logic.video-editor-update-ui-state();
+                    } else if (event.text == "a") {
+                        Logic.video-editor-select-all-segments();
                     }
                 }
             } else if (event.modifiers.alt) {
@@ -225,6 +227,7 @@ export component VideoEditor inherits Rectangle {
 
     if Store.video-editor-is-show-record-audio-dialog: RecordAudioDialog {
         close => {
+            self.stop();
             Store.video-editor-is-show-record-audio-dialog = false;
             fs.focus();
         }