[*] refactor: video-editor

Author: heng30

lib/video-editor/src/preview/playback.rs

@@ -1,6 +1,4 @@
-use crate::{
-    tracks::{Manager, frame_position::TimeToFrameConverter},
-};
+use crate::tracks::{Manager, frame_position::TimeToFrameConverter};
 use std::{sync::Arc, time::Duration};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -64,6 +62,7 @@ pub struct PlaybackController {
     total_frames: usize,   // Total number of frames
     speed: PlaybackSpeed,
     time_converter: TimeToFrameConverter,
+    volume: f32, // 0.0 to 1.0
 }
 
 impl PlaybackController {
@@ -77,6 +76,7 @@ impl PlaybackController {
             total_frames,
             speed: PlaybackSpeed::Normal,
             time_converter,
+            volume: 1.0,
         }
     }
 
@@ -96,6 +96,14 @@ impl PlaybackController {
         self.time_converter.fps_as_f32() as f64
     }
 
+    pub fn volume(&self) -> f32 {
+        self.volume
+    }
+
+    pub fn set_volume(&mut self, volume: f32) {
+        self.volume = volume.clamp(0.0, 1.0);
+    }
+
     pub fn set_position(&mut self, position: Duration) {
         let frame = self.time_converter.duration_to_frame(position);
         self.position_frame = frame.min(self.total_frames);

lib/video-editor/src/project/project.rs

@@ -47,14 +47,17 @@ pub enum TrackData {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct VideoTrackData {
+    pub name: String,
     pub hiding: bool,
+    pub muted: bool,
     pub metadata: MetadataData,
     pub duration_secs: f64,
     pub segments: Vec<SegmentData>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct AudioTrackData {
+    pub name: String,
     pub hiding: bool,
     pub metadata: MetadataData,
     pub duration_secs: f64,
@@ -63,6 +66,7 @@ pub struct AudioTrackData {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SubtitleTrackData {
+    pub name: String,
     pub hiding: bool,
     pub metadata: MetadataData,
     pub duration_secs: f64,
@@ -71,6 +75,7 @@ pub struct SubtitleTrackData {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct OverlayTrackData {
+    pub name: String,
     pub hiding: bool,
     pub metadata: MetadataData,
     pub duration_secs: f64,
@@ -91,7 +96,6 @@ pub struct SegmentData {
     pub source_offset_secs: f64,
     pub duration_secs: f64,
     pub metadata: MetadataData,
-    #[serde(default)]
     pub subtitle_text: Option<String>,
     pub video_filters: Vec<VideoFilterData>,
     pub audio_filters: Vec<AudioFilterData>,
@@ -156,7 +160,9 @@ impl From<&Track> for TrackData {
 impl VideoTrackData {
     fn from_video_track(track: &Arc<VideoTrack>) -> Self {
         Self {
+            name: track.name.clone(),
             hiding: track.hiding,
+            muted: track.muted,
             metadata: track.track.metadata.as_ref().into(),
             duration_secs: track.track.duration.as_secs_f64(),
             segments: track
@@ -172,6 +178,7 @@ impl VideoTrackData {
 impl AudioTrackData {
     fn from_audio_track(track: &Arc<AudioTrack>) -> Self {
         Self {
+            name: track.name.clone(),
             hiding: track.hiding,
             metadata: track.track.metadata.as_ref().into(),
             duration_secs: track.track.duration.as_secs_f64(),
@@ -188,6 +195,7 @@ impl AudioTrackData {
 impl SubtitleTrackData {
     fn from_subtitle_track(track: &Arc<SubtitleTrack>) -> Self {
         Self {
+            name: track.name.clone(),
             hiding: track.hiding,
             metadata: track.track.metadata.as_ref().into(),
             duration_secs: track.track.duration.as_secs_f64(),
@@ -204,6 +212,7 @@ impl SubtitleTrackData {
 impl OverlayTrackData {
     fn from_overlay_track(track: &Arc<OverlayTrack>) -> Self {
         Self {
+            name: track.name.clone(),
             hiding: track.hiding,
             metadata: track.track.metadata.as_ref().into(),
             duration_secs: track.track.duration.as_secs_f64(),
@@ -342,9 +351,9 @@ impl VideoTrackData {
             .collect::<Result<Vec<_>>>()?;
 
         Ok(Track::Video(Arc::new(VideoTrack {
-            name: String::default(),
+            name: self.name.clone(),
             hiding: self.hiding,
-            muted: false,
+            muted: self.muted,
             track: InnerTrack {
                 metadata,
                 duration: Duration::from_secs_f64(self.duration_secs),
@@ -364,7 +373,7 @@ impl AudioTrackData {
             .collect::<Result<Vec<_>>>()?;
 
         Ok(Track::Audio(Arc::new(AudioTrack {
-            name: String::default(),
+            name: self.name.clone(),
             hiding: self.hiding,
             track: InnerTrack {
                 metadata,
@@ -385,7 +394,7 @@ impl SubtitleTrackData {
             .collect::<Result<Vec<_>>>()?;
 
         Ok(Track::Subtitle(Arc::new(SubtitleTrack {
-            name: "S".to_string(),
+            name: self.name.clone(),
             hiding: self.hiding,
             track: InnerTrack::new(
                 metadata,
@@ -406,7 +415,7 @@ impl OverlayTrackData {
             .collect::<Result<Vec<_>>>()?;
 
         Ok(Track::Overlay(Arc::new(OverlayTrack {
-            name: String::default(),
+            name: self.name.clone(),
             hiding: self.hiding,
             track: InnerTrack {
                 metadata,

wayshot/src/logic/video_editor.rs

@@ -6,10 +6,10 @@ mod library;
 mod playlist;
 mod project;
 mod segment;
+mod subtitle;
 mod track;
 
 mod preview;
-mod subtitle;
 
 pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     project::init(ui);
@@ -19,7 +19,7 @@ pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     command::init(ui);
     track::init(ui);
     segment::init(ui);
-
     subtitle::init(ui);
+
     preview::init(ui);
 }