diff options
author | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-03-11 11:11:00 +0100 |
commit | 4495806f2f5045a0626ab64f43b5fc4deefe2ac0 (patch) | |
tree | e83b61b8da313fe1add571b9dd73261828c38cf9 /shared/models/server | |
parent | 052bdb7c120b2ac7a1616a8072f9eedd2ab2f4b6 (diff) | |
parent | 58ae266bada2233945c4446220c22ccc4e7c62b5 (diff) | |
download | PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.gz PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.tar.zst PeerTube-4495806f2f5045a0626ab64f43b5fc4deefe2ac0.zip |
Merge remote-tracking branch 'weblate/develop' into develop
Diffstat (limited to 'shared/models/server')
-rw-r--r-- | shared/models/server/custom-config.model.ts | 4 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index c9e7654de..5df606566 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -131,6 +131,10 @@ export interface CustomConfig { | |||
131 | 131 | ||
132 | allowReplay: boolean | 132 | allowReplay: boolean |
133 | 133 | ||
134 | latencySetting: { | ||
135 | enabled: boolean | ||
136 | } | ||
137 | |||
134 | maxDuration: number | 138 | maxDuration: number |
135 | maxInstanceLives: number | 139 | maxInstanceLives: number |
136 | maxUserLives: number | 140 | maxUserLives: number |
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index b06019bb8..d7fbed13c 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts | |||
@@ -149,10 +149,14 @@ export interface ServerConfig { | |||
149 | live: { | 149 | live: { |
150 | enabled: boolean | 150 | enabled: boolean |
151 | 151 | ||
152 | allowReplay: boolean | ||
153 | latencySetting: { | ||
154 | enabled: boolean | ||
155 | } | ||
156 | |||
152 | maxDuration: number | 157 | maxDuration: number |
153 | maxInstanceLives: number | 158 | maxInstanceLives: number |
154 | maxUserLives: number | 159 | maxUserLives: number |
155 | allowReplay: boolean | ||
156 | 160 | ||
157 | transcoding: { | 161 | transcoding: { |
158 | enabled: boolean | 162 | enabled: boolean |