Merge branch 'release/2.1.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / videos / video.model.ts

diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 6e7a6831ebf24969e136ad721af11c0d6a753bf6..a69152759aa0e77d43de607bf0a81ed02b2f1d48 100644 (file)
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,22 +1,11 @@
-import { AccountSummary, VideoChannelSummary, VideoResolution, VideoState } from '../../index'
+import { AccountSummary, VideoChannelSummary, VideoState } from '../../index'
 import { Account } from '../actors'
-import { Avatar } from '../avatars/avatar.model'
 import { VideoChannel } from './channel/video-channel.model'
 import { VideoPrivacy } from './video-privacy.enum'
 import { VideoScheduleUpdate } from './video-schedule-update.model'
 import { VideoConstant } from './video-constant.model'
 import { VideoStreamingPlaylist } from './video-streaming-playlist.model'
-
-export interface VideoFile {
-  magnetUri: string
-  resolution: VideoConstant<VideoResolution>
-  size: number // Bytes
-  torrentUrl: string
-  torrentDownloadUrl: string
-  fileUrl: string
-  fileDownloadUrl: string
-  fps: number
-}
+import { VideoFile } from './video-file.model'
 
 export interface Video {
   id: number
@@ -54,21 +43,15 @@ export interface Video {
   userHistory?: {
     currentTime: number
   }
-
-  playlistElement?: {
-    position: number
-    startTimestamp: number
-    stopTimestamp: number
-  }
 }
 
 export interface VideoDetails extends Video {
   descriptionPath: string
   support: string
   channel: VideoChannel
+  account: Account
   tags: string[]
   files: VideoFile[]
-  account: Account
   commentsEnabled: boolean
   downloadEnabled: boolean