From 080f14025ea5113d27b9732e06a1db7eb5489dea Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Oct 2022 14:16:15 +0200 Subject: Hide wait transcoding for lives Replays are always transcoded --- .../app/+videos/+video-edit/shared/video-edit.component.html | 2 +- .../app/+videos/+video-edit/shared/video-edit.component.ts | 11 ++++++----- .../video-add-components/video-go-live.component.html | 2 +- .../video-add-components/video-go-live.component.ts | 4 ---- .../video-add-components/video-upload.component.html | 2 +- .../src/app/+videos/+video-edit/video-update.component.html | 2 +- client/src/app/+videos/+video-edit/video-update.component.ts | 11 +++-------- 7 files changed, 13 insertions(+), 21 deletions(-) (limited to 'client') diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.html b/client/src/app/+videos/+video-edit/shared/video-edit.component.html index 7be5a3736..fa816fd9e 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.html @@ -141,7 +141,7 @@ - + Publish after transcoding diff --git a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts index 0275f66f5..13359a4d1 100644 --- a/client/src/app/+videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/+videos/+video-edit/shared/video-edit.component.ts @@ -22,6 +22,8 @@ import { import { FormReactiveValidationMessages, FormValidatorService } from '@app/shared/shared-forms' import { InstanceService } from '@app/shared/shared-instance' import { VideoCaptionEdit, VideoCaptionWithPathEdit, VideoEdit, VideoService } from '@app/shared/shared-main' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { logger } from '@root-helpers/logger' import { PluginInfo } from '@root-helpers/plugins-manager' import { HTMLServerConfig, @@ -33,13 +35,11 @@ import { VideoDetails, VideoPrivacy } from '@shared/models' +import { VideoSource } from '@shared/models/videos/video-source' import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service' import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' import { VideoCaptionEditModalContentComponent } from './video-caption-edit-modal-content/video-caption-edit-modal-content.component' import { VideoEditType } from './video-edit.type' -import { VideoSource } from '@shared/models/videos/video-source' -import { logger } from '@root-helpers/logger' -import { NgbModal } from '@ng-bootstrap/ng-bootstrap' type VideoLanguages = VideoConstant & { group?: string } type PluginField = { @@ -66,7 +66,8 @@ export class VideoEditComponent implements OnInit, OnDestroy { @Input() videoCaptions: VideoCaptionWithPathEdit[] = [] @Input() videoSource: VideoSource - @Input() waitTranscodingEnabled = true + @Input() hideWaitTranscoding = false + @Input() type: VideoEditType @Input() liveVideo: LiveVideo @@ -140,7 +141,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { nsfw: 'false', commentsEnabled: this.serverConfig.defaults.publish.commentsEnabled, downloadEnabled: this.serverConfig.defaults.publish.downloadEnabled, - waitTranscoding: 'true', + waitTranscoding: true, licence: this.serverConfig.defaults.publish.licence, tags: [] } diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html index 2fb29303f..e23fd77c7 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.html @@ -53,7 +53,7 @@
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts index 4f2276e8c..83a6b2229 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts +++ b/client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts @@ -160,10 +160,6 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView return this.serverConfig.live.maxDuration / 1000 } - isWaitTranscodingEnabled () { - return this.form.value['saveReplay'] === true - } - getNormalLiveDescription () { if (this.isReplayAllowed()) { return $localize`Stream only once, replay will replace your live` diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html index 728884986..8541868c5 100644 --- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html +++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.html @@ -96,7 +96,7 @@ diff --git a/client/src/app/+videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html index a33ac3db4..af564aeb0 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.html +++ b/client/src/app/+videos/+video-edit/video-update.component.html @@ -9,7 +9,7 @@ 1) { // Already transcoded - return false + return true } - if (this.liveVideo && this.form.value['saveReplay'] !== true) { - return false - } - - return true + return false } async update () { -- cgit v1.2.3