aboutsummaryrefslogtreecommitdiff
path: root/stream/src/hls.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-01-29 16:07:58 +0100
committermetamuffin <metamuffin@disroot.org>2025-01-29 16:07:58 +0100
commite7ba3274e27fad755f15465581f5b403c82ab4d2 (patch)
treef2d693c61786ee6ed027636393fd75f086bd77e8 /stream/src/hls.rs
parent5ac3f397b4a28b7bf8b399e73ad0d29e3da45ab0 (diff)
downloadjellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar
jellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar.bz2
jellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar.zst
prepare database refactor
Diffstat (limited to 'stream/src/hls.rs')
-rw-r--r--stream/src/hls.rs11
1 files changed, 3 insertions, 8 deletions
diff --git a/stream/src/hls.rs b/stream/src/hls.rs
index 342cbde..894d1b6 100644
--- a/stream/src/hls.rs
+++ b/stream/src/hls.rs
@@ -22,7 +22,7 @@ pub async fn hls_master_stream(
_spec: StreamSpec,
mut b: DuplexStream,
) -> Result<()> {
- let media = node.public.media.as_ref().ok_or(anyhow!("no media"))?;
+ let media = node.media.as_ref().ok_or(anyhow!("no media"))?;
let mut out = String::new();
writeln!(out, "#EXTM3U")?;
writeln!(out, "#EXT-X-VERSION:4")?;
@@ -57,14 +57,9 @@ pub async fn hls_variant_stream(
) -> Result<()> {
let local_track = local_tracks.first().ok_or(anyhow!("no track"))?.to_owned();
let track_index = spec.track[0];
- let media_info = node.public.media.to_owned().ok_or(anyhow!("no media?"))?;
+ let media_info = node.media.to_owned().ok_or(anyhow!("no media?"))?;
let frags = spawn_blocking(move || {
- jellyremuxer::fragment::fragment_index(
- &CONF.media_path,
- &node.public,
- &local_track,
- track_index,
- )
+ jellyremuxer::fragment::fragment_index(&CONF.media_path, &node, &local_track, track_index)
})
.await??;