Fix live image aspect ratio in theatre mode

[github/Chocobozzz/PeerTube.git] / client / src / app / +videos / +video-watch / video-watch.component.ts

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 2216bdd4a194072b0b2d35ff21ba4c01cbfa4577..116139d473e372fa39db69415c3914904b069904 100644 (file)
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -188,7 +188,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     })
 
     this.queryParamsSub = this.route.queryParams.subscribe(queryParams => {
-      this.playlistPosition = queryParams[ 'playlistPosition' ]
+      // Handle the ?playlistPosition
+      const positionParam = queryParams[ 'playlistPosition' ] ?? 1
+
+      this.playlistPosition = positionParam === 'last'
+        ? -1 // Handle the "last" index
+        : parseInt(positionParam + '', 10)
+
+      if (isNaN(this.playlistPosition)) {
+        console.error(`playlistPosition query param '${positionParam}' was parsed as NaN, defaulting to 1.`)
+        this.playlistPosition = 1
+      }
+
       this.videoWatchPlaylist.updatePlaylistIndex(this.playlistPosition)
 
       const start = queryParams[ 'start' ]
@@ -663,7 +674,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
       this.player.one('ended', () => {
         if (this.video.isLive) {
-          this.video.state.id = VideoState.LIVE_ENDED
+          this.zone.run(() => this.video.state.id = VideoState.LIVE_ENDED)
         }
       })
 
@@ -795,19 +806,6 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       src: environment.apiUrl + c.captionPath
     }))
 
-    const playlistOptions = this.playlist
-      ? {
-        createComponent: false,
-
-        playlist: this.playlist,
-
-        getCurrentPosition: () => this.playlistPosition,
-
-        embedUrl: this.playlist.embedUrl,
-        embedTitle: this.playlist.displayName
-      }
-      : undefined
-
     const options: PeertubePlayerManagerOptions = {
       common: {
         autoplay: this.isAutoplay(),
@@ -852,9 +850,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
         videoCaptions: playerCaptions,
 
-        videoUUID: video.uuid,
-
-        playlist: playlistOptions
+        videoUUID: video.uuid
       },
 
       webtorrent: {
@@ -862,6 +858,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
       }
     }
 
+    // Only set this if we're in a playlist
+    if (this.playlist) {
+      options.common.previousVideo = () => {
+        this.zone.run(() => this.videoWatchPlaylist.navigateToPreviousPlaylistVideo())
+      }
+    }
+
     let mode: PlayerMode
 
     if (urlOptions.playerMode) {