Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy lints that don't currently appear in CI (#27944)

Browse source 
I may have a newer version of clippy than CI. Also removes some unused
code in `livekit_client.rs`

Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-04-02 12:00:16 -06:00 • committed by GitHub
parent f8092bf0d2
commit 142f9917d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/livekit_client/src/livekit_client.rs
View file

@ -61,7 +61,7 @@ impl Room {
let task = cx.background_executor().spawn(async move {
while let Some(event) = events.recv().await {
if let Some(event) = room_event_from_livekit(event) {
tx.send(event.into()).await.ok();
tx.send(event).await.ok();
}
}
});
@ -112,33 +112,6 @@ impl Room {
Ok((publication, stream))
}
// pub async fn publish_local_wav_track(
// &self,
// cx: &mut AsyncApp,
// ) -> Result<(LocalTrackPublication, playback::AudioStream)> {
// let apm = self.apm.clone();
// let executor = cx.background_executor().clone();
// let (track, stream) =
// Tokio::spawn(
// cx,
// async move { capture_local_wav_track(apm, &executor).await },
// )?
// .await??;
// let publication = self
// .local_participant()
// .publish_track(
// livekit::track::LocalTrack::Audio(track.0),
// livekit::options::TrackPublishOptions {
// source: livekit::track::TrackSource::Microphone,
// ..Default::default()
// },
// cx,
// )
// .await?;
// Ok((publication, stream))
// }
pub async fn unpublish_local_track(
&self,
sid: TrackSid,
@ -162,7 +135,7 @@ impl LocalParticipant {
source: &dyn ScreenCaptureSource,
cx: &mut AsyncApp,
) -> Result<(LocalTrackPublication, Box<dyn ScreenCaptureStream>)> {
let (track, stream) = capture_local_video_track(&*source, cx).await?;
let (track, stream) = capture_local_video_track(source, cx).await?;
let options = livekit::options::TrackPublishOptions {
source: livekit::track::TrackSource::Screenshare,
video_codec: livekit::options::VideoCodec::VP8,
@ -186,7 +159,7 @@ impl LocalParticipant {
participant.publish_track(track, options).await
})?
.await?
.map(|p| LocalTrackPublication(p))
.map(LocalTrackPublication)
.map_err(|error| anyhow::anyhow!("failed to publish track: {error}"))
}
@ -198,7 +171,7 @@ impl LocalParticipant {
let participant = self.0.clone();
Tokio::spawn(cx, async move { participant.unpublish_track(&sid).await })?
.await?
.map(|p| LocalTrackPublication(p))
.map(LocalTrackPublication)
.map_err(|error| anyhow::anyhow!("failed to unpublish track: {error}"))
}
}
@ -476,7 +449,7 @@ fn room_event_from_livekit(event: livekit::RoomEvent) -> Option<RoomEvent> {
|(p, t)| {
(
RemoteParticipant(p),
t.into_iter().map(|t| RemoteTrackPublication(t)).collect(),
t.into_iter().map(RemoteTrackPublication).collect(),
)
}
})

4
crates/livekit_client/src/livekit_client/playback.rs
View file

@ -271,9 +271,9 @@ impl AudioStack {
let mut sampled = resampler
.remix_and_resample(
buf.as_slice(),
config.sample_rate().0 as u32 / 100,
config.sample_rate().0 / 100,
config.channels() as u32,
config.sample_rate().0 as u32,
config.sample_rate().0,
num_channels,
sample_rate,
)