diff options
author | metamuffin <metamuffin@disroot.org> | 2023-12-22 23:57:03 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 23:57:03 +0100 |
commit | 75949cebdd61dd8f0d06f2e47081c460e2a442f0 (patch) | |
tree | ea0fc2ff003b7694ee06555d731bce1f08199136 /stream/src/lib.rs | |
parent | c4682c231cbfa2bd4b44e14548800a64cc9cdbb8 (diff) | |
download | jellything-75949cebdd61dd8f0d06f2e47081c460e2a442f0.tar jellything-75949cebdd61dd8f0d06f2e47081c460e2a442f0.tar.bz2 jellything-75949cebdd61dd8f0d06f2e47081c460e2a442f0.tar.zst |
rework import system pt. 8: federated streams & change jhls
Diffstat (limited to 'stream/src/lib.rs')
-rw-r--r-- | stream/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/src/lib.rs b/stream/src/lib.rs index e2137d3..e86230c 100644 --- a/stream/src/lib.rs +++ b/stream/src/lib.rs @@ -17,7 +17,7 @@ use jellycommon::{ user::{PermissionSet, UserPermission}, LocalTrack, Node, TrackSource, }; -use jhls::jhls_stream; +use jhls::jhls_index; use segment::segment_stream; use std::{io::SeekFrom, ops::Range}; use tokio::{ @@ -85,7 +85,7 @@ pub async fn stream( StreamFormat::Matroska => remux_stream(node, local_tracks, spec, range, b).await?, StreamFormat::HlsMaster => hls_master_stream(node, local_tracks, spec, b).await?, StreamFormat::HlsVariant => hls_variant_stream(node, local_tracks, spec, b).await?, - StreamFormat::Jhls => jhls_stream(node, &track_sources, spec, b, perms).await?, + StreamFormat::Jhls => jhls_index(node, &local_tracks, spec, b, perms).await?, StreamFormat::Segment => segment_stream(node, local_tracks, spec, b, perms).await?, StreamFormat::Webvtt => webvtt_stream(node, local_tracks, spec, b).await?, } |