From 3a29113e965a94bdef06655f1583cc6e86edd606 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Thu, 21 Dec 2023 23:57:42 +0100 Subject: rework import system pt. 1 --- stream/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'stream/src/lib.rs') diff --git a/stream/src/lib.rs b/stream/src/lib.rs index 604e3eb..1ee0690 100644 --- a/stream/src/lib.rs +++ b/stream/src/lib.rs @@ -15,7 +15,7 @@ use jellybase::{permission::PermissionSetExt, CONF}; use jellycommon::{ stream::{StreamFormat, StreamSpec}, user::{PermissionSet, UserPermission}, - LocalTrack, MediaSource, Node, + LocalTrack, Node, }; use jhls::jhls_stream; use segment::segment_stream; @@ -55,13 +55,14 @@ pub async fn stream( let (a, b) = duplex(4096); + // TODO remux of mixed remote and local tracks?! let track_sources = match node .private .source .as_ref() .ok_or(anyhow!("node has no media"))? { - MediaSource::Local { tracks } => tracks.to_owned(), + // MediaSource::Local { tracks } => tracks.to_owned(), _ => bail!("node tracks are not local"), }; -- cgit v1.2.3-70-g09d2