diff options
-rw-r--r-- | client/src/app/core/menu/menu.service.ts | 2 | ||||
-rw-r--r-- | server/lib/activitypub/videos.ts | 3 | ||||
-rw-r--r-- | server/lib/video-transcoding.ts | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts index 46ef72e17..ecb2bceb7 100644 --- a/client/src/app/core/menu/menu.service.ts +++ b/client/src/app/core/menu/menu.service.ts | |||
@@ -8,7 +8,7 @@ export class MenuService { | |||
8 | isMenuDisplayed = true | 8 | isMenuDisplayed = true |
9 | isMenuChangedByUser = false | 9 | isMenuChangedByUser = false |
10 | 10 | ||
11 | constructor( | 11 | constructor ( |
12 | private screenService: ScreenService | 12 | private screenService: ScreenService |
13 | ) { | 13 | ) { |
14 | // Do not display menu on small screens | 14 | // Do not display menu on small screens |
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 452e43c8c..62f589272 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts | |||
@@ -9,13 +9,12 @@ import { | |||
9 | ActivityPlaylistUrlObject, | 9 | ActivityPlaylistUrlObject, |
10 | ActivityTagObject, | 10 | ActivityTagObject, |
11 | ActivityUrlObject, | 11 | ActivityUrlObject, |
12 | ActivityVideoFileMetadataObject, | ||
13 | ActivityVideoUrlObject, | 12 | ActivityVideoUrlObject, |
14 | VideoState | 13 | VideoState |
15 | } from '../../../shared/index' | 14 | } from '../../../shared/index' |
16 | import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' | 15 | import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' |
17 | import { VideoPrivacy } from '../../../shared/models/videos' | 16 | import { VideoPrivacy } from '../../../shared/models/videos' |
18 | import { sanitizeAndCheckVideoTorrentObject, isAPVideoFileMetadataObject } from '../../helpers/custom-validators/activitypub/videos' | 17 | import { isAPVideoFileMetadataObject, sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' |
19 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' | 18 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' |
20 | import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' | 19 | import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' |
21 | import { logger } from '../../helpers/logger' | 20 | import { logger } from '../../helpers/logger' |
diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index bde4c2633..ab1e917f3 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts | |||
@@ -2,8 +2,8 @@ import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSER | |||
2 | import { basename, extname as extnameUtil, join } from 'path' | 2 | import { basename, extname as extnameUtil, join } from 'path' |
3 | import { | 3 | import { |
4 | canDoQuickTranscode, | 4 | canDoQuickTranscode, |
5 | getMetadataFromFile, | ||
6 | getDurationFromVideoFile, | 5 | getDurationFromVideoFile, |
6 | getMetadataFromFile, | ||
7 | getVideoFileFPS, | 7 | getVideoFileFPS, |
8 | transcode, | 8 | transcode, |
9 | TranscodeOptions, | 9 | TranscodeOptions, |
@@ -20,7 +20,6 @@ import { CONFIG } from '../initializers/config' | |||
20 | import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models' | 20 | import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models' |
21 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' | 21 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' |
22 | import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths' | 22 | import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths' |
23 | import { extractVideo } from './videos' | ||
24 | 23 | ||
25 | /** | 24 | /** |
26 | * Optimize the original video file and replace it. The resolution is not changed. | 25 | * Optimize the original video file and replace it. The resolution is not changed. |