diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
| commit | b92983fb0cab2a284301b930d2b15ec0109dd93e (patch) | |
| tree | f7fb1b900b3fa5ced46de392a47756c3ca5cc398 /stream/src/lib.rs | |
| parent | 9a52852f736692e5319da49478e16bfba30fbd39 (diff) | |
| parent | 826c61c9612e855b19c3adb0e93d80bbfb4dc903 (diff) | |
| download | jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.bz2 jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.zst | |
Merge branch 'master' of codeberg.org:metamuffin/jellything
Diffstat (limited to 'stream/src/lib.rs')
| -rw-r--r-- | stream/src/lib.rs | 5 |
1 files changed, 3 insertions, 2 deletions
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"), }; |