upt

Gahara-Editor · Aug 28, 2024 · b8dc50a · b8dc50a
1 parent a98b72a
commit b8dc50a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/app.go b/app.go
@@ -106,8 +106,8 @@ func (a *App) AddTrack() {
 	a.Timeline.AddTrack()
 }
 
-func (a *App) RemoveTrack(id int) error {
-	return a.Timeline.RemoveTrack(id)
+func (a *App) RemoveTrack(tid int) error {
+	return a.Timeline.RemoveTrack(tid)
 }
 
 func (a *App) OpenFile(filepath string) error {
@@ -405,6 +405,10 @@ func (a *App) EnableVideoMenus() {
 	vimCommandsMenu.AddText("Add Timeline Track", keys.Shift("t"), func(cd *menu.CallbackData) {
 		wruntime.EventsEmit(a.ctx, video.EVT_ADD_TRACK)
 	})
+	vimCommandsMenu.AddText("Remove Timeline Track", keys.Shift("d"), func(cd *menu.CallbackData) {
+		wruntime.EventsEmit(a.ctx, video.EVT_REMOVE_TRACK)
+	})
+
 	vimCommandsMenu.AddText("Save Timeline", keys.Shift("w"), func(cd *menu.CallbackData) {
 		err := a.SaveTimeline()
 		if err != nil {

diff --git a/frontend/src/ToolingLayout.svelte b/frontend/src/ToolingLayout.svelte
@@ -9,6 +9,7 @@
   import {
     AddTrack,
     RemoveInterval,
+    RemoveTrack,
     SplitInterval,
   } from "../wailsjs/go/main/App";
   import TrashIcon from "./icons/TrashIcon.svelte";
@@ -31,8 +32,12 @@
     setClipRegister,
     setActionMsg,
   } = toolingStore;
-  const { addTrack, removeVideoFromTrack, removeAndAddIntervalToTrack } =
-    trackStore;
+  const {
+    addTrack,
+    removeTrack,
+    removeVideoFromTrack,
+    removeAndAddIntervalToTrack,
+  } = trackStore;
 
   let executeEdit = false;
 
@@ -46,6 +51,13 @@
     });
   }
 
+  function handleRemoveTrack() {
+    const tid = $trackCursorIdx;
+    RemoveTrack(tid).then(() => {
+      removeTrack(tid);
+    });
+  }
+
   function handleTwoCut() {
     if ($editMode === "timeline" && $timelineNode) {
       SplitInterval(
@@ -128,12 +140,17 @@
   EventsOn("evt_add_track", () => {
     handleAddTrack();
   });
+  EventsOn("evt_remove_track", () => {
+    handleRemoveTrack();
+  });
   onDestroy(() => {
     EventsOff(
       "evt_toggle_vim_mode",
       "evt_change_vim_mode",
       "evt_splitclip_edit",
       "evt_execute_edit",
+      "evt_add_track",
+      "evt_remove_track",
     );
   });
 </script>

diff --git a/frontend/src/stores.ts b/frontend/src/stores.ts
@@ -170,6 +170,15 @@ function createTracksStore() {
     });
   }
 
+  function removeTrack(tid: number) {
+    update((tracks) => {
+      if (tid >= 0 && tid < tracks.length) {
+        tracks.splice(tid, 1);
+      }
+      return tracks;
+    });
+  }
+
   function addVideoToTrack(
     tid: number,
     pos: number,
@@ -302,6 +311,7 @@ function createTracksStore() {
     getClipPosInTrack,
     setTrackTime,
     addTrack,
+    removeTrack,
     addVideoToTrack,
     removeVideoFromTrack,
     removeAndAddIntervalToTrack,

diff --git a/internal/video/video.go b/internal/video/video.go
@@ -73,6 +73,8 @@ const (
 	EVT_YANK_CLIP = "evt_yank_clip"
 	// EVT_ADD_TRACK: adds a new track
 	EVT_ADD_TRACK = "evt_add_track"
+	// EVT_REMOVE_TRACK: removes a track
+	EVT_REMOVE_TRACK = "evt_remove_track"
 	// EVT_OPEN_RENAME_CLIP_MODAL: opens the rename clip modal
 	EVT_OPEN_RENAME_CLIP_MODAL = "evt_open_rename_clip_modal"
 	// EVT_INTERVAL_CUT: interval cut event