diff options
Diffstat (limited to 'shared/models/server')
-rw-r--r-- | shared/models/server/custom-config.model.ts | 2 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 29 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 2 |
3 files changed, 15 insertions, 18 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 5df606566..ab83ed497 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -147,7 +147,7 @@ export interface CustomConfig { | |||
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | videoEditor: { | 150 | videoStudio: { |
151 | enabled: boolean | 151 | enabled: boolean |
152 | } | 152 | } |
153 | 153 | ||
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 3b4855eaa..91469d010 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { ContextType } from '../activitypub/context' | 1 | import { ContextType } from '../activitypub/context' |
2 | import { VideoState } from '../videos' | 2 | import { VideoState } from '../videos' |
3 | import { VideoEditorTaskCut } from '../videos/editor' | 3 | import { VideoStudioTaskCut } from '../videos/studio' |
4 | import { VideoResolution } from '../videos/file/video-resolution.enum' | 4 | import { VideoResolution } from '../videos/file/video-resolution.enum' |
5 | import { SendEmailOptions } from './emailer.model' | 5 | import { SendEmailOptions } from './emailer.model' |
6 | 6 | ||
@@ -23,7 +23,7 @@ export type JobType = | |||
23 | | 'actor-keys' | 23 | | 'actor-keys' |
24 | | 'manage-video-torrent' | 24 | | 'manage-video-torrent' |
25 | | 'move-to-object-storage' | 25 | | 'move-to-object-storage' |
26 | | 'video-edition' | 26 | | 'video-studio-edition' |
27 | 27 | ||
28 | export interface Job { | 28 | export interface Job { |
29 | id: number | 29 | id: number |
@@ -117,9 +117,6 @@ export type ManageVideoTorrentPayload = | |||
117 | interface BaseTranscodingPayload { | 117 | interface BaseTranscodingPayload { |
118 | videoUUID: string | 118 | videoUUID: string |
119 | isNewVideo?: boolean | 119 | isNewVideo?: boolean |
120 | |||
121 | // Custom notification when the task is finished | ||
122 | notification?: 'default' | 'video-edition' | ||
123 | } | 120 | } |
124 | 121 | ||
125 | export interface HLSTranscodingPayload extends BaseTranscodingPayload { | 122 | export interface HLSTranscodingPayload extends BaseTranscodingPayload { |
@@ -178,9 +175,9 @@ export interface MoveObjectStoragePayload { | |||
178 | previousVideoState: VideoState | 175 | previousVideoState: VideoState |
179 | } | 176 | } |
180 | 177 | ||
181 | export type VideoEditorTaskCutPayload = VideoEditorTaskCut | 178 | export type VideoStudioTaskCutPayload = VideoStudioTaskCut |
182 | 179 | ||
183 | export type VideoEditorTaskIntroPayload = { | 180 | export type VideoStudioTaskIntroPayload = { |
184 | name: 'add-intro' | 181 | name: 'add-intro' |
185 | 182 | ||
186 | options: { | 183 | options: { |
@@ -188,7 +185,7 @@ export type VideoEditorTaskIntroPayload = { | |||
188 | } | 185 | } |
189 | } | 186 | } |
190 | 187 | ||
191 | export type VideoEditorTaskOutroPayload = { | 188 | export type VideoStudioTaskOutroPayload = { |
192 | name: 'add-outro' | 189 | name: 'add-outro' |
193 | 190 | ||
194 | options: { | 191 | options: { |
@@ -196,7 +193,7 @@ export type VideoEditorTaskOutroPayload = { | |||
196 | } | 193 | } |
197 | } | 194 | } |
198 | 195 | ||
199 | export type VideoEditorTaskWatermarkPayload = { | 196 | export type VideoStudioTaskWatermarkPayload = { |
200 | name: 'add-watermark' | 197 | name: 'add-watermark' |
201 | 198 | ||
202 | options: { | 199 | options: { |
@@ -204,13 +201,13 @@ export type VideoEditorTaskWatermarkPayload = { | |||
204 | } | 201 | } |
205 | } | 202 | } |
206 | 203 | ||
207 | export type VideoEditionTaskPayload = | 204 | export type VideoStudioTaskPayload = |
208 | VideoEditorTaskCutPayload | | 205 | VideoStudioTaskCutPayload | |
209 | VideoEditorTaskIntroPayload | | 206 | VideoStudioTaskIntroPayload | |
210 | VideoEditorTaskOutroPayload | | 207 | VideoStudioTaskOutroPayload | |
211 | VideoEditorTaskWatermarkPayload | 208 | VideoStudioTaskWatermarkPayload |
212 | 209 | ||
213 | export interface VideoEditionPayload { | 210 | export interface VideoStudioEditionPayload { |
214 | videoUUID: string | 211 | videoUUID: string |
215 | tasks: VideoEditionTaskPayload[] | 212 | tasks: VideoStudioTaskPayload[] |
216 | } | 213 | } |
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 146bed24b..67ad809f7 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts | |||
@@ -175,7 +175,7 @@ export interface ServerConfig { | |||
175 | } | 175 | } |
176 | } | 176 | } |
177 | 177 | ||
178 | videoEditor: { | 178 | videoStudio: { |
179 | enabled: boolean | 179 | enabled: boolean |
180 | } | 180 | } |
181 | 181 | ||