Add ability to disable P2P in HLS player too

diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
index 6f9159ec82d8465d260ef01946f8c6705ed40e12..17d8cde06ac734eb893d763d98aa59b8fbf54f54 100644 (file)
--- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
@@ -38,7 +38,7 @@
   <div class="form-group">
     <my-peertube-checkbox
       inputName="webTorrentEnabled" formControlName="webTorrentEnabled"
-      i18n-labelText labelText="Use WebTorrent to exchange parts of the video with others"
+      i18n-labelText labelText="Use P2P to exchange parts of the video with others"
     ></my-peertube-checkbox>
   </div>
 

diff --git a/client/src/assets/player/peertube-player-local-storage.ts b/client/src/assets/player/peertube-player-local-storage.ts
index f6c5c5419fd5120124d3a294602989e56495b04f..75ccfe6181ef5724c5c88743855292ee53a93af7 100644 (file)
--- a/client/src/assets/player/peertube-player-local-storage.ts
+++ b/client/src/assets/player/peertube-player-local-storage.ts
@@ -10,7 +10,7 @@ function getStoredVolume () {
   return undefined
 }
 
-function getStoredWebTorrentEnabled (): boolean {
+function getStoredP2PEnabled (): boolean {
   const value = getLocalStorage('webtorrent_enabled')
   if (value !== null && value !== undefined) return value === 'true'
 
@@ -72,7 +72,7 @@ function getStoredLastSubtitle () {
 
 export {
   getStoredVolume,
-  getStoredWebTorrentEnabled,
+  getStoredP2PEnabled,
   getStoredMute,
   getStoredTheater,
   saveVolumeInStore,

diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts
index bda718cffd25ae6d667fc88bf48e444899b6fc9d..7c7c9ad2a6127cb7e034f72126bd25d555df10fe 100644 (file)
--- a/client/src/assets/player/peertube-player-manager.ts
+++ b/client/src/assets/player/peertube-player-manager.ts
@@ -18,6 +18,7 @@ import { getCompleteLocale, getShortLocale, is18nLocale, isDefaultLocale } from
 import { segmentValidatorFactory } from './p2p-media-loader/segment-validator'
 import { segmentUrlBuilderFactory } from './p2p-media-loader/segment-url-builder'
 import { RedundancyUrlManager } from './p2p-media-loader/redundancy-url-manager'
+import { getStoredP2PEnabled } from './peertube-player-local-storage'
 
 // Change 'Playback Rate' to 'Speed' (smaller for our settings menu)
 videojsUntyped.getComponent('PlaybackRateMenuButton').prototype.controlText_ = 'Speed'
@@ -245,7 +246,8 @@ export class PeertubePlayerManager {
           segmentValidator: segmentValidatorFactory(options.p2pMediaLoader.segmentsSha256Url),
           rtcConfig: getRtcConfig(),
           requiredSegmentsPriority: 5,
-          segmentUrlBuilder: segmentUrlBuilderFactory(redundancyUrlManager)
+          segmentUrlBuilder: segmentUrlBuilderFactory(redundancyUrlManager),
+          useP2P: getStoredP2PEnabled()
         },
         segments: {
           swarmId: p2pMediaLoaderOptions.playlistUrl

diff --git a/client/src/assets/player/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
index 656a32f49ac9479654afbbd57669ff50170c3009..5101b516251fdd4c9a9fd51d5499623d33e5d8c2 100644 (file)
--- a/client/src/assets/player/webtorrent/webtorrent-plugin.ts
+++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
@@ -11,7 +11,7 @@ import {
   getAverageBandwidthInStore,
   getStoredMute,
   getStoredVolume,
-  getStoredWebTorrentEnabled,
+  getStoredP2PEnabled,
   saveAverageBandwidth
 } from '../peertube-player-local-storage'
 import { VideoFile } from '@shared/models'
@@ -77,7 +77,7 @@ class WebTorrentPlugin extends Plugin {
 
     // Disable auto play on iOS
     this.autoplay = options.autoplay && this.isIOS() === false
-    this.playerRefusedP2P = !getStoredWebTorrentEnabled()
+    this.playerRefusedP2P = !getStoredP2PEnabled()
 
     this.videoFiles = options.videoFiles
     this.videoDuration = options.videoDuration