From ebc8dd52caaacb379f4cf060c9a8cca4081abd5c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 19 Aug 2020 16:27:44 +0200 Subject: [PATCH] Correctly fix autoplay with webtorrent --- .../src/assets/player/peertube-player-manager.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/assets/player/peertube-player-manager.ts b/client/src/assets/player/peertube-player-manager.ts index 8e0a9109f..4d72523f7 100644 --- a/client/src/assets/player/peertube-player-manager.ts +++ b/client/src/assets/player/peertube-player-manager.ts @@ -365,8 +365,12 @@ export class PeertubePlayerManager { const commonOptions = options.common const webtorrentOptions = options.webtorrent + const autoplay = this.getAutoPlayValue(commonOptions.autoplay) === 'play' + ? true + : false + const webtorrent = { - autoplay: commonOptions.autoplay, + autoplay, videoDuration: commonOptions.videoDuration, playerElement: commonOptions.playerElement, videoFiles: webtorrentOptions.videoFiles, @@ -586,13 +590,9 @@ export class PeertubePlayerManager { private static getAutoPlayValue (autoplay: any) { if (autoplay !== true) return autoplay - // We have issues with autoplay and Safari with webtorrent - if (isIOS()) { - // On first play, disable autoplay to avoid issues - // But if the player already played videos, we can safely autoplay next ones - return PeertubePlayerManager.alreadyPlayed ? 'play' : false - } else if (isSafari()) { - // Issues with Safari and webtorrent on first play + // On first play, disable autoplay to avoid issues + // But if the player already played videos, we can safely autoplay next ones + if (isIOS() || isSafari()) { return PeertubePlayerManager.alreadyPlayed ? 'play' : false } -- 2.41.0