diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-10 16:13:22 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-07-10 16:13:22 +0200 |
commit | 63e2f087c3410206aa294df8099b005e615592e5 (patch) | |
tree | bbc60b9b258f35442e9c6e6104e8df255f3704f1 /shared/models | |
parent | 83b42f5a32df30fc8b665d52c7ef707c0c5c8566 (diff) | |
parent | 8953f055c86ca74f145d7ac5ac93bb6104d73af9 (diff) | |
download | PeerTube-63e2f087c3410206aa294df8099b005e615592e5.tar.gz PeerTube-63e2f087c3410206aa294df8099b005e615592e5.tar.zst PeerTube-63e2f087c3410206aa294df8099b005e615592e5.zip |
Merge branch 'feature/remove-webtorrent' into develop
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/metrics/playback-metric-create.model.ts | 2 | ||||
-rw-r--r-- | shared/models/plugins/client/client-hook.model.ts | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/shared/models/metrics/playback-metric-create.model.ts b/shared/models/metrics/playback-metric-create.model.ts index d669ab690..3a8f328c8 100644 --- a/shared/models/metrics/playback-metric-create.model.ts +++ b/shared/models/metrics/playback-metric-create.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { VideoResolution } from '../videos' | 1 | import { VideoResolution } from '../videos' |
2 | 2 | ||
3 | export interface PlaybackMetricCreate { | 3 | export interface PlaybackMetricCreate { |
4 | playerMode: 'p2p-media-loader' | 'webtorrent' | 4 | playerMode: 'p2p-media-loader' | 'webtorrent' | 'web-video' // FIXME: remove webtorrent player mode not used anymore in PeerTube v6 |
5 | 5 | ||
6 | resolution?: VideoResolution | 6 | resolution?: VideoResolution |
7 | fps?: number | 7 | fps?: number |
diff --git a/shared/models/plugins/client/client-hook.model.ts b/shared/models/plugins/client/client-hook.model.ts index bc3f5dd9f..4a0818c99 100644 --- a/shared/models/plugins/client/client-hook.model.ts +++ b/shared/models/plugins/client/client-hook.model.ts | |||
@@ -59,6 +59,10 @@ export const clientFilterHookObject = { | |||
59 | 'filter:internal.video-watch.player.build-options.params': true, | 59 | 'filter:internal.video-watch.player.build-options.params': true, |
60 | 'filter:internal.video-watch.player.build-options.result': true, | 60 | 'filter:internal.video-watch.player.build-options.result': true, |
61 | 61 | ||
62 | // Filter the options to load a new video in our player | ||
63 | 'filter:internal.video-watch.player.load-options.params': true, | ||
64 | 'filter:internal.video-watch.player.load-options.result': true, | ||
65 | |||
62 | // Filter our SVG icons content | 66 | // Filter our SVG icons content |
63 | 'filter:internal.common.svg-icons.get-content.params': true, | 67 | 'filter:internal.common.svg-icons.get-content.params': true, |
64 | 'filter:internal.common.svg-icons.get-content.result': true, | 68 | 'filter:internal.common.svg-icons.get-content.result': true, |