diff options
author | Chocobozzz <me@florianbigard.com> | 2019-03-07 17:06:00 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-03-18 11:17:59 +0100 |
commit | f0a3988066f72a28bb44520af072f18d91d77dde (patch) | |
tree | dfa3a92102557b567530c5dd014c90866621140a /client/src/assets/player/peertube-player-manager.ts | |
parent | 830b4faff15fb9c81d88e8e69fcdf94aad32bef8 (diff) | |
download | PeerTube-f0a3988066f72a28bb44520af072f18d91d77dde.tar.gz PeerTube-f0a3988066f72a28bb44520af072f18d91d77dde.tar.zst PeerTube-f0a3988066f72a28bb44520af072f18d91d77dde.zip |
Add to playlist dropdown
Diffstat (limited to 'client/src/assets/player/peertube-player-manager.ts')
-rw-r--r-- | client/src/assets/player/peertube-player-manager.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 7631d095f..6cdd54372 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts | |||
@@ -49,6 +49,7 @@ export type CommonOptions = { | |||
49 | inactivityTimeout: number | 49 | inactivityTimeout: number |
50 | poster: string | 50 | poster: string |
51 | startTime: number | string | 51 | startTime: number | string |
52 | stopTime: number | string | ||
52 | 53 | ||
53 | theaterMode: boolean | 54 | theaterMode: boolean |
54 | captions: boolean | 55 | captions: boolean |
@@ -199,10 +200,10 @@ export class PeertubePlayerManager { | |||
199 | autoplay, // Use peertube plugin autoplay because we get the file by webtorrent | 200 | autoplay, // Use peertube plugin autoplay because we get the file by webtorrent |
200 | videoViewUrl: commonOptions.videoViewUrl, | 201 | videoViewUrl: commonOptions.videoViewUrl, |
201 | videoDuration: commonOptions.videoDuration, | 202 | videoDuration: commonOptions.videoDuration, |
202 | startTime: commonOptions.startTime, | ||
203 | userWatching: commonOptions.userWatching, | 203 | userWatching: commonOptions.userWatching, |
204 | subtitle: commonOptions.subtitle, | 204 | subtitle: commonOptions.subtitle, |
205 | videoCaptions: commonOptions.videoCaptions | 205 | videoCaptions: commonOptions.videoCaptions, |
206 | stopTime: commonOptions.stopTime | ||
206 | } | 207 | } |
207 | } | 208 | } |
208 | 209 | ||
@@ -210,6 +211,7 @@ export class PeertubePlayerManager { | |||
210 | const p2pMediaLoader: P2PMediaLoaderPluginOptions = { | 211 | const p2pMediaLoader: P2PMediaLoaderPluginOptions = { |
211 | redundancyBaseUrls: options.p2pMediaLoader.redundancyBaseUrls, | 212 | redundancyBaseUrls: options.p2pMediaLoader.redundancyBaseUrls, |
212 | type: 'application/x-mpegURL', | 213 | type: 'application/x-mpegURL', |
214 | startTime: commonOptions.startTime, | ||
213 | src: p2pMediaLoaderOptions.playlistUrl | 215 | src: p2pMediaLoaderOptions.playlistUrl |
214 | } | 216 | } |
215 | 217 | ||
@@ -254,7 +256,8 @@ export class PeertubePlayerManager { | |||
254 | autoplay, | 256 | autoplay, |
255 | videoDuration: commonOptions.videoDuration, | 257 | videoDuration: commonOptions.videoDuration, |
256 | playerElement: commonOptions.playerElement, | 258 | playerElement: commonOptions.playerElement, |
257 | videoFiles: webtorrentOptions.videoFiles | 259 | videoFiles: webtorrentOptions.videoFiles, |
260 | startTime: commonOptions.startTime | ||
258 | } | 261 | } |
259 | Object.assign(plugins, { webtorrent }) | 262 | Object.assign(plugins, { webtorrent }) |
260 | 263 | ||