From 83fcadac86da0bc6120a5b93850bb9a7fc069fba Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 31 Jan 2020 11:39:50 +0100 Subject: Move streamroot plugin in core project To avoid an already bundled HLS.js library, and adapt some parts of the code --- client/src/assets/player/peertube-player-manager.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client/src/assets/player/peertube-player-manager.ts') diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 4e6387a53..dbf631a5e 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts @@ -211,9 +211,9 @@ export class PeertubePlayerManager { } if (mode === 'p2p-media-loader') { - const { streamrootHls } = PeertubePlayerManager.addP2PMediaLoaderOptions(plugins, options, p2pMediaLoaderModule) + const { hlsjs } = PeertubePlayerManager.addP2PMediaLoaderOptions(plugins, options, p2pMediaLoaderModule) - html5 = streamrootHls.html5 + html5 = hlsjs.html5 } if (mode === 'webtorrent') { @@ -303,7 +303,7 @@ export class PeertubePlayerManager { swarmId: p2pMediaLoaderOptions.playlistUrl } } - const streamrootHls = { + const hlsjs = { levelLabelHandler: (level: { height: number, width: number }) => { const file = p2pMediaLoaderOptions.videoFiles.find(f => f.resolution.id === level.height) @@ -322,7 +322,7 @@ export class PeertubePlayerManager { } } - const toAssign = { p2pMediaLoader, streamrootHls } + const toAssign = { p2pMediaLoader, hlsjs } Object.assign(plugins, toAssign) return toAssign -- cgit v1.2.3