diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-01-29 16:07:58 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-01-29 16:07:58 +0100 |
| commit | e7ba3274e27fad755f15465581f5b403c82ab4d2 (patch) | |
| tree | f2d693c61786ee6ed027636393fd75f086bd77e8 /stream/src/lib.rs | |
| parent | 5ac3f397b4a28b7bf8b399e73ad0d29e3da45ab0 (diff) | |
| download | jellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar jellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar.bz2 jellything-e7ba3274e27fad755f15465581f5b403c82ab4d2.tar.zst | |
prepare database refactor
Diffstat (limited to 'stream/src/lib.rs')
| -rw-r--r-- | stream/src/lib.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/stream/src/lib.rs b/stream/src/lib.rs index a316042..f4cbbf6 100644 --- a/stream/src/lib.rs +++ b/stream/src/lib.rs @@ -57,20 +57,18 @@ pub async fn stream( let (a, b) = duplex(4096); // TODO remux of mixed remote and local tracks?! - let track_sources = node - .private - .source - .to_owned() - .ok_or(anyhow!("node has no media"))?; + let track_sources = node.media.to_owned().ok_or(anyhow!("node has no media"))?; let local_tracks = spec .track .iter() .map(|i| { anyhow::Ok( - match track_sources + match &track_sources + .tracks .get(*i) .ok_or(anyhow!("track does not exist"))? + .source { TrackSource::Local(t) => t.to_owned(), TrackSource::Remote(_) => bail!("track is not local"), @@ -109,7 +107,7 @@ async fn remux_stream( b, range, CONF.media_path.to_owned(), - node.public, + &node, local_tracks, spec.track, spec.webm.unwrap_or(false), |