import { TranslationsManager } from '../../assets/player/translations-manager'
import { getParamString, logger, videoRequiresAuth } from '../../root-helpers'
import { PeerTubeEmbedApi } from './embed-api'
-import { AuthHTTP, LiveManager, PeerTubePlugin, PlayerManagerOptions, PlaylistFetcher, PlaylistTracker, Translations, VideoFetcher } from './shared'
+import {
+ AuthHTTP,
+ LiveManager,
+ PeerTubePlugin,
+ PlayerManagerOptions,
+ PlaylistFetcher,
+ PlaylistTracker,
+ Translations,
+ VideoFetcher
+} from './shared'
import { PlayerHTML } from './shared/player-html'
export class PeerTubeEmbed {
if (!videoId) return
- return this.loadVideoAndBuildPlayer(videoId)
+ return this.loadVideoAndBuildPlayer({ uuid: videoId, autoplayFromPreviousVideo: false, forceAutoplay: false })
}
private async initPlaylist () {
this.playlistTracker.setCurrentElement(next)
- return this.loadVideoAndBuildPlayer(next.video.uuid)
+ return this.loadVideoAndBuildPlayer({ uuid: next.video.uuid, autoplayFromPreviousVideo: true, forceAutoplay: false })
}
async playPreviousPlaylistVideo () {
this.playlistTracker.setCurrentElement(previous)
- await this.loadVideoAndBuildPlayer(previous.video.uuid)
+ await this.loadVideoAndBuildPlayer({ uuid: previous.video.uuid, autoplayFromPreviousVideo: true, forceAutoplay: false })
}
getCurrentPlaylistPosition () {
// ---------------------------------------------------------------------------
- private async loadVideoAndBuildPlayer (uuid: string) {
+ private async loadVideoAndBuildPlayer (options: {
+ uuid: string
+ autoplayFromPreviousVideo: boolean
+ forceAutoplay: boolean
+ }) {
+ const { uuid, autoplayFromPreviousVideo, forceAutoplay } = options
+
try {
const { videoResponse, captionsPromise } = await this.videoFetcher.loadVideo(uuid)
- return this.buildVideoPlayer(videoResponse, captionsPromise)
+ return this.buildVideoPlayer({ videoResponse, captionsPromise, autoplayFromPreviousVideo, forceAutoplay })
} catch (err) {
this.playerHTML.displayError(err.message, await this.translationsPromise)
}
}
- private async buildVideoPlayer (videoResponse: Response, captionsPromise: Promise<Response>) {
- const alreadyHadPlayer = this.resetPlayerElement()
+ private async buildVideoPlayer (options: {
+ videoResponse: Response
+ captionsPromise: Promise<Response>
+ autoplayFromPreviousVideo: boolean
+ forceAutoplay: boolean
+ }) {
+ const { videoResponse, captionsPromise, autoplayFromPreviousVideo, forceAutoplay } = options
+
+ this.resetPlayerElement()
const videoInfoPromise = videoResponse.json()
.then(async (videoInfo: VideoDetails) => {
this.playerManagerOptions.loadParams(this.config, videoInfo)
- if (!alreadyHadPlayer && !this.playerManagerOptions.hasAutoplay()) {
+ if (!autoplayFromPreviousVideo && !this.playerManagerOptions.hasAutoplay()) {
this.playerHTML.buildPlaceholder(videoInfo)
}
const live = videoInfo.isLive
const PlayerManager: typeof PeertubePlayerManager = PeertubePlayerManagerModule.PeertubePlayerManager
- const options = await this.playerManagerOptions.getPlayerOptions({
+ const playerOptions = await this.playerManagerOptions.getPlayerOptions({
video,
captionsResponse,
- alreadyHadPlayer,
+ autoplayFromPreviousVideo,
translations,
serverConfig: this.config,
authorizationHeader: () => this.http.getHeaderTokenValue(),
videoFileToken: () => videoFileToken,
- onVideoUpdate: (uuid: string) => this.loadVideoAndBuildPlayer(uuid),
+ onVideoUpdate: (uuid: string) => this.loadVideoAndBuildPlayer({ uuid, autoplayFromPreviousVideo: true, forceAutoplay: false }),
playlistTracker: this.playlistTracker,
playNextPlaylistVideo: () => this.playNextPlaylistVideo(),
playPreviousPlaylistVideo: () => this.playPreviousPlaylistVideo(),
- live
+ live,
+ forceAutoplay
})
- this.player = await PlayerManager.initialize(this.playerManagerOptions.getMode(), options, (player: videojs.Player) => {
+ this.player = await PlayerManager.initialize(this.playerManagerOptions.getMode(), playerOptions, (player: videojs.Player) => {
this.player = player
})
video,
onPublishedVideo: () => {
this.liveManager.stopListeningForChanges(video)
- this.loadVideoAndBuildPlayer(video.uuid)
+ this.loadVideoAndBuildPlayer({ uuid: video.uuid, autoplayFromPreviousVideo: false, forceAutoplay: true })
}
})
}
private resetPlayerElement () {
- let alreadyHadPlayer = false
-
if (this.player) {
this.player.dispose()
this.player = undefined
- alreadyHadPlayer = true
}
const playerElement = document.createElement('video')
this.playerHTML.setPlayerElement(playerElement)
this.playerHTML.addPlayerElementToDOM()
-
- return alreadyHadPlayer
}
private async buildPlayerPlaylistUpnext () {