Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Restore playback rates between sessions

Chocobozzz9d525c2c94f2
diff --git a/client/src/standalone/player/src/peertube-player-local-storage.ts b/client/src/standalone/player/src/peertube-player-local-storage.ts
index c406c669a2..65520d1cce 100644
--- a/client/src/standalone/player/src/peertube-player-local-storage.ts
+++ b/client/src/standalone/player/src/peertube-player-local-storage.ts
@@ -2,59 +2,53 @@ import { logger } from '@root-helpers/logger'
import { peertubeLocalStorage, peertubeSessionStorage } from '@root-helpers/peertube-web-storage'
import { randomString } from '@root-helpers/string'
-export function getStoredVolume () {
- const value = getLocalStorage('volume')
- if (value !== null && value !== undefined) {
- const valueNumber = parseFloat(value)
- if (isNaN(valueNumber)) return undefined
-
- return valueNumber
- }
-
- return undefined
+export function getStoredPlaybackRate () {
+ return parseLocalStorageFloat(getLocalStorage('playback-rate'))
}
-export function getStoredMute () {
- const value = getLocalStorage('mute')
- if (value !== null && value !== undefined) return value === 'true'
-
- return undefined
+export function savePlaybackRateInStore (value: number) {
+ return setLocalStorage('playback-rate', value.toString())
}
-export function getStoredTheater () {
- const value = getLocalStorage('theater-enabled')
- if (value !== null && value !== undefined) return value === 'true'
+// ---------------------------------------------------------------------------
- return false
+export function getStoredVolume () {
+ return parseLocalStorageFloat(getLocalStorage('volume'))
}
export function saveVolumeInStore (value: number) {
return setLocalStorage('volume', value.toString())
}
+// ---------------------------------------------------------------------------
+
+export function getStoredMute () {
+ return parseLocalStorageBool(getLocalStorage('mute'))
+}
+
export function saveMuteInStore (value: boolean) {
return setLocalStorage('mute', value.toString())
}
+// ---------------------------------------------------------------------------
+
+export function getStoredTheater () {
+ return parseLocalStorageBool(getLocalStorage('theater-enabled'))
+}
+
export function saveTheaterInStore (enabled: boolean) {
return setLocalStorage('theater-enabled', enabled.toString())
}
+// ---------------------------------------------------------------------------
+
export function saveAverageBandwidth (value: number) {
/** used to choose the most fitting resolution */
return setLocalStorage('average-bandwidth', value.toString())
}
export function getAverageBandwidthInStore () {
- const value = getLocalStorage('average-bandwidth')
- if (value !== null && value !== undefined) {
- const valueNumber = parseInt(value, 10)
- if (isNaN(valueNumber)) return undefined
-
- return valueNumber
- }
-
- return undefined
+ return parseLocalStorageInt(getLocalStorage('average-bandwidth'))
}
// ---------------------------------------------------------------------------
@@ -78,14 +72,17 @@ export function getStoredPreferredSubtitle () {
// ---------------------------------------------------------------------------
export function saveVideoWatchHistory (videoUUID: string, duration: number) {
- return setLocalStorage(`video-watch-history`, JSON.stringify({
- ...getStoredVideoWatchHistory(),
+ return setLocalStorage(
+ `video-watch-history`,
+ JSON.stringify({
+ ...getStoredVideoWatchHistory(),
- [videoUUID]: {
- duration,
- date: `${(new Date()).toISOString()}`
- }
- }))
+ [videoUUID]: {
+ duration,
+ date: `${(new Date()).toISOString()}`
+ }
+ })
+ )
}
export function getStoredVideoWatchHistory (videoUUID?: string) {
@@ -162,3 +159,31 @@ function getSessionStorage (key: string) {
function setSessionStorage (key: string, value: string) {
peertubeSessionStorage.setItem(KEY_PREFIX + key, value)
}
+
+function parseLocalStorageFloat (value: string) {
+ if (value !== null && value !== undefined) {
+ const valueNumber = parseFloat(value)
+ if (isNaN(valueNumber)) return undefined
+
+ return valueNumber
+ }
+
+ return undefined
+}
+
+function parseLocalStorageInt (value: string) {
+ if (value !== null && value !== undefined) {
+ const valueNumber = parseInt(value, 10)
+ if (isNaN(valueNumber)) return undefined
+
+ return valueNumber
+ }
+
+ return undefined
+}
+
+function parseLocalStorageBool (value: string) {
+ if (value !== null && value !== undefined) return value === 'true'
+
+ return undefined
+}
diff --git a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts b/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts
index 80d4c862eb..df34fb0d7c 100644
--- a/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts
+++ b/client/src/standalone/player/src/shared/peertube/peertube-plugin.ts
@@ -11,9 +11,11 @@ import {
getPlayerSessionId,
getStoredLastSubtitle,
getStoredMute,
+ getStoredPlaybackRate,
getStoredVolume,
saveLastSubtitle,
saveMuteInStore,
+ savePlaybackRateInStore,
savePreferredSubtitle,
saveVideoWatchHistory,
saveVolumeInStore
@@ -103,6 +105,7 @@ class PeerTubePlugin extends Plugin {
this.player.on('ratechange', () => {
this.currentPlaybackRate = this.player.playbackRate()
+ savePlaybackRateInStore(this.currentPlaybackRate)
this.player.defaultPlaybackRate(this.currentPlaybackRate)
})
@@ -116,6 +119,13 @@ class PeerTubePlugin extends Plugin {
const muted = playerOptions.muted !== undefined ? playerOptions.muted : getStoredMute()
if (muted !== undefined) this.player.muted(muted)
+ const savedPlaybackRate = getStoredPlaybackRate()
+ if (savedPlaybackRate !== undefined) {
+ this.currentPlaybackRate = savedPlaybackRate
+ this.player.playbackRate(this.currentPlaybackRate)
+ this.player.defaultPlaybackRate(this.currentPlaybackRate)
+ }
+
this.player.addClass('vjs-can-play')
})