aboutsummaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-01-29 15:03:18 +0100
committermetamuffin <metamuffin@disroot.org>2024-01-29 15:03:18 +0100
commitc0ba30314a06de10c9b98ac130676dcbc9f287fa (patch)
treee35631ed3181f89ae962e9125cc5073f12967924 /server/src
parent4ad7aa6042c64a6e7cfbe2693a4bbeda0514357b (diff)
downloadjellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar
jellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar.bz2
jellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar.zst
rename stream spec param
Diffstat (limited to 'server/src')
-rw-r--r--server/src/routes/stream.rs6
-rw-r--r--server/src/routes/ui/player.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs
index 4c9906d..ecfa3e7 100644
--- a/server/src/routes/stream.rs
+++ b/server/src/routes/stream.rs
@@ -64,8 +64,8 @@ pub async fn r_stream(
.ok_or(anyhow!("item does not contain media"))?;
// TODO its unclear how requests with multiple tracks should be handled.
- if spec.tracks.len() == 1 {
- let ti = spec.tracks[0];
+ if spec.track.len() == 1 {
+ let ti = spec.track[0];
if let TrackSource::Remote(remote_index) = source[ti] {
session
.user
@@ -102,7 +102,7 @@ pub async fn r_stream(
let uri = session.stream_url(
node.public.id.as_ref().unwrap(),
&StreamSpec {
- tracks: vec![remote_index],
+ track: vec![remote_index],
..spec
},
);
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs
index 7e67709..233547e 100644
--- a/server/src/routes/ui/player.rs
+++ b/server/src/routes/ui/player.rs
@@ -52,7 +52,7 @@ pub fn r_player<'a>(
let item = T_NODE.get(db, id)?.ok_or(anyhow!("node does not exist"))?;
let spec = StreamSpec {
- tracks: None
+ track: None
.into_iter()
.chain(conf.v.into_iter())
.chain(conf.a.into_iter())
@@ -63,7 +63,7 @@ pub fn r_player<'a>(
..Default::default()
};
- let playing = !spec.tracks.is_empty();
+ let playing = !spec.track.is_empty();
let conf = player_conf(item.clone(), playing)?;
Ok(LayoutPage {