mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 20:29:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Deafen now also mutes microphone

Browse source
This commit is contained in:
Piotr Osiewicz 2023-06-22 20:05:06 +02:00
parent f774dbfe2e
commit 8bd9fe1fb0
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crates/call/src/room.rs
View file

@ -1176,24 +1176,31 @@ impl Room {
})
})
}
pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
if let Some(live_kit) = self.live_kit.as_mut() {
match &mut live_kit.microphone_track {
LocalTrack::None => Err(anyhow!("microphone was not shared")),
LocalTrack::Pending { muted, .. } => {
*muted = !*muted;
Ok(Task::Ready(Some(Ok(()))))
}
LocalTrack::Published {
track_publication,
muted,
} => {
*muted = !*muted;
Ok(cx.background().spawn(track_publication.set_mute(*muted)))
}
fn set_mute(
live_kit: &mut LiveKitRoom,
should_mute: bool,
cx: &mut ModelContext<Self>,
) -> Result<Task<Result<()>>> {
match &mut live_kit.microphone_track {
LocalTrack::None => Err(anyhow!("microphone was not shared")),
LocalTrack::Pending { muted, .. } => {
*muted = should_mute;
Ok(Task::Ready(Some(Ok(()))))
}
LocalTrack::Published {
track_publication,
muted,
} => {
*muted = should_mute;
Ok(cx.background().spawn(track_publication.set_mute(*muted)))
}
}
}
pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
let should_mute = self.is_muted().unwrap_or(false);
if let Some(live_kit) = self.live_kit.as_mut() {
Self::set_mute(live_kit, !should_mute, cx)
} else {
Err(anyhow!("LiveKit not started"))
}
@ -1204,9 +1211,9 @@ impl Room {
(*live_kit).deafened = !live_kit.deafened
}
if let Some(live_kit) = &self.live_kit {
if let Some(live_kit) = self.live_kit.as_mut() {
let mut tasks = Vec::with_capacity(self.remote_participants.len());
let _ = Self::set_mute(live_kit, live_kit.deafened, cx)?; // todo (osiewicz): we probably want to schedule it on fg/bg?
for participant in self.remote_participants.values() {
for track in live_kit
.room
@ -1215,7 +1222,6 @@ impl Room {
tasks.push(cx.foreground().spawn(track.set_enabled(!live_kit.deafened)));
}
}
Ok(cx.foreground().spawn(async move {
for task in tasks {
task.await?;