diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-12-22 15:16:58 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 15:17:23 +0100 |
| commit | 80e545d06c4a0f0841d4b40e3aff479ef8d864f9 (patch) | |
| tree | 9a555ea9404f45fb7ebf617ebdfb1f8248332e05 /stream/src/segment.rs | |
| parent | c644f3b2f7b93cba2c903fa2a5e30ea80d86ef13 (diff) | |
| download | jellything-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/segment.rs')
| -rw-r--r-- | stream/src/segment.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/stream/src/segment.rs b/stream/src/segment.rs index 309da1d..a2553bc 100644 --- a/stream/src/segment.rs +++ b/stream/src/segment.rs @@ -17,7 +17,7 @@ use tokio_util::io::SyncIoBridge; pub async fn segment_stream( node: Node, - track_sources: Vec<LocalTrack>, + local_tracks: Vec<LocalTrack>, spec: StreamSpec, mut b: DuplexStream, perms: &PermissionSet, @@ -28,6 +28,11 @@ pub async fn segment_stream( let track = spec.tracks[0]; let n = spec.index.ok_or(anyhow!("segment index missing"))?; + let local_track = local_tracks + .get(0) + .ok_or(anyhow!("track missing"))? + .to_owned(); + if let Some(profile) = spec.profile { perms.assert(&UserPermission::Transcode)?; let location = transcode( @@ -41,7 +46,7 @@ pub async fn segment_stream( SyncIoBridge::new(b), &CONF.library_path, &node.public, - track_sources, + &local_track, track, false, n, @@ -65,7 +70,7 @@ pub async fn segment_stream( b, &CONF.library_path, &node.public, - track_sources, + &local_track, track, spec.webm.unwrap_or(false), n, |