Merge branch 'release/3.3.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / assets / player / stats / stats-card.ts

diff --git a/client/src/assets/player/stats/stats-card.ts b/client/src/assets/player/stats/stats-card.ts
index f66766089e699a5103216c09b369e66963dc3597..b271d052660fb129039ef5c82037a2e84e7e55df 100644 (file)
--- a/client/src/assets/player/stats/stats-card.ts
+++ b/client/src/assets/player/stats/stats-card.ts
@@ -1,6 +1,7 @@
 import videojs from 'video.js'
+import { secondsToTime } from '@shared/core-utils'
 import { PlayerNetworkInfo as EventPlayerNetworkInfo } from '../peertube-videojs-typings'
-import { bytes, secondsToTime } from '../utils'
+import { bytes } from '../utils'
 
 interface StatsCardOptions extends videojs.ComponentOptions {
   videoUUID: string
@@ -89,9 +90,9 @@ class StatsCard extends Component {
     this.container.style.display = 'block'
     this.updateInterval = setInterval(async () => {
       try {
-        const options = this.mode === 'webtorrent'
-          ? await this.buildWebTorrentOptions()
-          : await this.buildHLSOptions()
+        const options = this.mode === 'p2p-media-loader'
+          ? await this.buildHLSOptions()
+          : await this.buildWebTorrentOptions() // Default
 
         this.list.innerHTML = this.getListTemplate(options)
       } catch (err) {
@@ -193,7 +194,7 @@ class StatsCard extends Component {
 
     const duration = player.duration()
 
-    let volume = `${player.volume() * 100}`
+    let volume = `${Math.round(player.volume() * 100)}`
     if (player.muted()) volume += ' (muted)'
 
     const networkActivity = playerNetworkInfo.downloadSpeed
@@ -212,6 +213,8 @@ class StatsCard extends Component {
       : undefined
 
     return `
+      ${this.buildElement(player.localize('Player mode'), this.mode || 'HTTP')}
+
       ${this.buildElement(player.localize('Video UUID'), this.options_.videoUUID)}
 
       ${this.buildElement(player.localize('Viewport / Frames'), frames)}