aboutsummaryrefslogtreecommitdiff
path: root/stream/src/hls.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2023-12-22 15:16:58 +0100
committermetamuffin <metamuffin@disroot.org>2023-12-22 15:17:23 +0100
commit80e545d06c4a0f0841d4b40e3aff479ef8d864f9 (patch)
tree9a555ea9404f45fb7ebf617ebdfb1f8248332e05 /stream/src/hls.rs
parentc644f3b2f7b93cba2c903fa2a5e30ea80d86ef13 (diff)
downloadjellything-80e545d06c4a0f0841d4b40e3aff479ef8d864f9.tar
jellything-80e545d06c4a0f0841d4b40e3aff479ef8d864f9.tar.bz2
jellything-80e545d06c4a0f0841d4b40e3aff479ef8d864f9.tar.zst
rework import system pt. 5: local import and playback working again
Diffstat (limited to 'stream/src/hls.rs')
-rw-r--r--stream/src/hls.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/stream/src/hls.rs b/stream/src/hls.rs
index ea82fed..74f18b4 100644
--- a/stream/src/hls.rs
+++ b/stream/src/hls.rs
@@ -18,7 +18,7 @@ use tokio::{
pub async fn hls_master_stream(
_node: Node,
- _track_sources: Vec<LocalTrack>,
+ _local_tracks: Vec<LocalTrack>,
spec: StreamSpec,
mut b: DuplexStream,
) -> Result<()> {
@@ -45,17 +45,15 @@ pub async fn hls_master_stream(
pub async fn hls_variant_stream(
node: Node,
- track_sources: Vec<LocalTrack>,
+ local_tracks: Vec<LocalTrack>,
mut spec: StreamSpec,
mut b: DuplexStream,
) -> Result<()> {
- let track = *spec.tracks.get(0).ok_or(anyhow!("no track"))?;
let snips = spawn_blocking(move || {
jellyremuxer::snippet::snippet_index(
&CONF.library_path,
&node.public,
- &track_sources,
- track,
+ local_tracks.get(0).ok_or(anyhow!("no track"))?,
)
})
.await??;