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

Fix post-merge compile errors

Browse source
This commit is contained in:
Nathan Sobo 2023-11-01 21:16:41 -06:00
parent db9ccd7f34
commit 2079cd641e
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/call2/src/room.rs
View file

@ -134,7 +134,7 @@ impl Room {
}
});
let _maintain_video_tracks = cx.spawn_on_main({
let _maintain_video_tracks = cx.spawn({
let room = room.clone();
move |this, mut cx| async move {
let mut track_video_changes = room.remote_video_track_updates();
@ -153,7 +153,7 @@ impl Room {
}
});
let _maintain_audio_tracks = cx.spawn_on_main({
let _maintain_audio_tracks = cx.spawn({
let room = room.clone();
|this, mut cx| async move {
let mut track_audio_changes = room.remote_audio_track_updates();
@ -1301,7 +1301,9 @@ impl Room {
live_kit.room.unpublish_track(publication);
} else {
if muted {
cx.executor().spawn(publication.set_mute(muted)).detach();
cx.background_executor()
.spawn(publication.set_mute(muted))
.detach();
}
live_kit.microphone_track = LocalTrack::Published {
track_publication: publication,
@ -1344,7 +1346,7 @@ impl Room {
return Task::ready(Err(anyhow!("live-kit was not initialized")));
};
cx.spawn_on_main(move |this, mut cx| async move {
cx.spawn(move |this, mut cx| async move {
let publish_track = async {
let displays = displays.await?;
let display = displays
@ -1387,7 +1389,9 @@ impl Room {
live_kit.room.unpublish_track(publication);
} else {
if muted {
cx.executor().spawn(publication.set_mute(muted)).detach();
cx.background_executor()
.spawn(publication.set_mute(muted))
.detach();
}
live_kit.screen_track = LocalTrack::Published {
track_publication: publication,
@ -1454,14 +1458,11 @@ impl Room {
.remote_audio_track_publications(&participant.user.id.to_string())
{
let deafened = live_kit.deafened;
tasks.push(
cx.executor()
.spawn_on_main(move || track.set_enabled(!deafened)),
);
tasks.push(cx.foreground_executor().spawn(track.set_enabled(!deafened)));
}
}
Ok(cx.executor().spawn_on_main(|| async {
Ok(cx.foreground_executor().spawn(async move {
if let Some(mute_task) = mute_task {
mute_task.await?;
}