diff options
| author | tpart <tpart120@proton.me> | 2023-12-09 11:10:22 +0100 |
|---|---|---|
| committer | tpart <tpart120@proton.me> | 2023-12-09 11:10:22 +0100 |
| commit | 6d87fe0b3c875ef3c7dd1d811d237e75567f787b (patch) | |
| tree | a7531389b2a8ad6d8b89d92900b96fcf0e431774 /common | |
| parent | 5c7e30b15d1e42fa8d65d344dfdef0af73b3b6d4 (diff) | |
| parent | 1d2ed0a54c21e0ab7dd01b5f3975bb5df12d40ea (diff) | |
| download | jellything-6d87fe0b3c875ef3c7dd1d811d237e75567f787b.tar jellything-6d87fe0b3c875ef3c7dd1d811d237e75567f787b.tar.bz2 jellything-6d87fe0b3c875ef3c7dd1d811d237e75567f787b.tar.zst | |
Merge branch 'master' of codeberg.org:metamuffin/jellything
Diffstat (limited to 'common')
| -rw-r--r-- | common/src/stream.rs | 2 | ||||
| -rw-r--r-- | common/src/user.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/src/stream.rs b/common/src/stream.rs index 6c93294..aa1b931 100644 --- a/common/src/stream.rs +++ b/common/src/stream.rs @@ -28,6 +28,7 @@ pub enum StreamFormat { #[cfg_attr(feature = "rocket", field(value = "hlsvariant"))] HlsVariant, #[cfg_attr(feature = "rocket", field(value = "jhls"))] Jhls, #[cfg_attr(feature = "rocket", field(value = "hlsseg"))] Segment, + #[cfg_attr(feature = "rocket", field(value = "webvtt"))] Webvtt, } impl Default for StreamSpec { @@ -82,6 +83,7 @@ impl StreamFormat { StreamFormat::HlsVariant => "hlsvariant", StreamFormat::Jhls => "jhls", StreamFormat::Segment => "hlsseg", + StreamFormat::Webvtt => "webvtt", } } } diff --git a/common/src/user.rs b/common/src/user.rs index 2b67de5..ae9a757 100644 --- a/common/src/user.rs +++ b/common/src/user.rs @@ -58,7 +58,7 @@ impl UserPermission { self, Transcode | FederatedContent - | StreamFormat(Jhls | HlsMaster | HlsVariant | Matroska | Segment) + | StreamFormat(Jhls | HlsMaster | HlsVariant | Matroska | Segment | Webvtt) ) } } |