import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { forkJoin, map, Observable, of, Subscription, switchMap } from 'rxjs'
-import { isP2PEnabled } from 'src/assets/player/utils'
+import { VideoJsPlayer } from 'video.js'
import { PlatformLocation } from '@angular/common'
import { Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
import { LiveVideoService } from '@app/shared/shared-video-live'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
+import { isP2PEnabled } from '@root-helpers/video'
import { timeToInt } from '@shared/core-utils'
import {
HTMLServerConfig,
@ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
@ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
- player: any
+ player: VideoJsPlayer
playerElement: HTMLVideoElement
playerPlaceholderImgSrc: string
theaterEnabled = false
this.zone.runOutsideAngular(async () => {
this.player = await PeertubePlayerManager.initialize(playerMode, playerOptions, player => this.player = player)
- this.player.on('customError', ({ err }: { err: any }) => {
- this.zone.run(() => this.handleGlobalError(err))
+ this.player.on('customError', (_e, data: any) => {
+ this.zone.run(() => this.handleGlobalError(data.err))
})
this.player.on('timeupdate', () => {
suspended: () => {
return (
- !isXPercentInViewport(this.player.el(), 80) ||
+ !isXPercentInViewport(this.player.el() as HTMLElement, 80) ||
!document.getElementById('content').contains(document.activeElement)
)
}
videoCaptions: VideoCaption[]
urlOptions: CustomizationOptions & { playerMode: PlayerMode }
loggedInOrAnonymousUser: User
- user?: AuthUser
+ user?: AuthUser // Keep for plugins
}) {
- const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser, user } = params
+ const { video, liveVideo, videoCaptions, urlOptions, loggedInOrAnonymousUser } = params
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
startTime,
stopTime: urlOptions.stopTime,
+ controlBar: urlOptions.controlBar,
controls: urlOptions.controls,
muted: urlOptions.muted,
loop: urlOptions.loop,
videoViewUrl: video.privacy.id !== VideoPrivacy.PRIVATE
? this.videoService.getVideoViewUrl(video.uuid)
: null,
+ authorizationHeader: this.authService.getRequestHeaderValue(),
+
embedUrl: video.embedUrl,
embedTitle: video.name,
language: this.localeId,
- userWatching: user && user.videosHistoryEnabled === true
- ? {
- url: this.videoService.getUserWatchingVideoUrl(video.uuid),
- authorizationHeader: this.authService.getRequestHeaderValue()
- }
- : undefined,
-
serverUrl: environment.apiUrl,
videoCaptions: playerCaptions,