From 0b53d68b214b022a4ae6292785c165ad95e71696 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 23 Dec 2023 00:43:42 +0100 Subject: rework ~~import~~ system pt. 8.1: update the player to new format --- common/src/stream.rs | 8 ++++---- common/src/user.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'common/src') diff --git a/common/src/stream.rs b/common/src/stream.rs index aa1b931..4aa51d3 100644 --- a/common/src/stream.rs +++ b/common/src/stream.rs @@ -26,8 +26,8 @@ pub enum StreamFormat { #[cfg_attr(feature = "rocket", field(value = "matroska"))] Matroska, #[cfg_attr(feature = "rocket", field(value = "hlsmaster"))] HlsMaster, #[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 = "jhlsi"))] JhlsIndex, + #[cfg_attr(feature = "rocket", field(value = "snippet"))] Snippet, #[cfg_attr(feature = "rocket", field(value = "webvtt"))] Webvtt, } @@ -81,8 +81,8 @@ impl StreamFormat { StreamFormat::Matroska => "matroska", StreamFormat::HlsMaster => "hlsmaster", StreamFormat::HlsVariant => "hlsvariant", - StreamFormat::Jhls => "jhls", - StreamFormat::Segment => "hlsseg", + StreamFormat::JhlsIndex => "jhlsi", + StreamFormat::Snippet => "snippet", StreamFormat::Webvtt => "webvtt", } } diff --git a/common/src/user.rs b/common/src/user.rs index 7e654a9..7fc1233 100644 --- a/common/src/user.rs +++ b/common/src/user.rs @@ -96,7 +96,7 @@ impl UserPermission { Transcode | ManageSelf | FederatedContent - | StreamFormat(Jhls | HlsMaster | HlsVariant | Matroska | Segment | Webvtt) + | StreamFormat(JhlsIndex | HlsMaster | HlsVariant | Matroska | Snippet | Webvtt) ) } } -- cgit v1.2.3-70-g09d2