aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-12-17 14:20:43 +0100
committerChocobozzz <me@florianbigard.com>2019-12-18 10:14:23 +0100
commit6377a9f2b0f762be9af61f46b4f0a9efd0c4b7c2 (patch)
treec632833f4275df8d75a6df55fe8673a7dec7c0ec /client/src/assets
parentc3b937916711136cb1ce974f769205439a3d2e04 (diff)
downloadPeerTube-6377a9f2b0f762be9af61f46b4f0a9efd0c4b7c2.tar.gz
PeerTube-6377a9f2b0f762be9af61f46b4f0a9efd0c4b7c2.tar.zst
PeerTube-6377a9f2b0f762be9af61f46b4f0a9efd0c4b7c2.zip
Fix test embed page
Diffstat (limited to 'client/src/assets')
-rw-r--r--client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts4
-rw-r--r--client/src/assets/player/webtorrent/webtorrent-plugin.ts4
2 files changed, 8 insertions, 0 deletions
diff --git a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
index c44c184d5..c3f863f72 100644
--- a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
+++ b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
@@ -77,6 +77,10 @@ class P2pMediaLoaderPlugin extends Plugin {
77 clearInterval(this.networkInfoInterval) 77 clearInterval(this.networkInfoInterval)
78 } 78 }
79 79
80 getHLSJS () {
81 return this.hlsjs
82 }
83
80 private initialize () { 84 private initialize () {
81 initHlsJsPlayer(this.hlsjs) 85 initHlsJsPlayer(this.hlsjs)
82 86
diff --git a/client/src/assets/player/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
index 5101b5162..35cf85c99 100644
--- a/client/src/assets/player/webtorrent/webtorrent-plugin.ts
+++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts
@@ -229,6 +229,10 @@ class WebTorrentPlugin extends Plugin {
229 this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() }) 229 this.trigger('resolutionChange', { auto: this.autoResolution, resolutionId: this.getCurrentResolutionId() })
230 } 230 }
231 231
232 isAutoResolutionPossible () {
233 return this.autoResolutionPossible
234 }
235
232 getTorrent () { 236 getTorrent () {
233 return this.torrent 237 return this.torrent
234 } 238 }