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

Add a mic sharing to room joining

Browse source
This commit is contained in:
Mikayla Maki 2023-06-20 15:35:19 -07:00
parent 8273e08d4a
commit 9b77cafd7b
No known key found for this signature in database
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -238,7 +238,7 @@ impl Room {
} }
Ok(room) Ok(room)
}, }
Err(error) => Err(anyhow!("room creation failed: {:?}", error)), Err(error) => Err(anyhow!("room creation failed: {:?}", error)),
} }
}) })
@ -266,6 +266,14 @@ impl Room {
room.update(&mut cx, |room, cx| { room.update(&mut cx, |room, cx| {
room.leave_when_empty = true; room.leave_when_empty = true;
room.apply_room_update(room_proto, cx)?; room.apply_room_update(room_proto, cx)?;
if option_env!("START_MIC").is_some()
|| &*util::channel::RELEASE_CHANNEL != &ReleaseChannel::Dev
{
let share_mic = room.share_mic(cx);
cx.background().spawn(share_mic).detach_and_log_err(cx);
}
anyhow::Ok(()) anyhow::Ok(())
})?; })?;
Ok(room) Ok(room)
@ -1001,19 +1009,17 @@ impl Room {
} }
pub fn is_muted(&self) -> Option<bool> { pub fn is_muted(&self) -> Option<bool> {
self.live_kit.as_ref().and_then(|live_kit| { self.live_kit
match &live_kit.microphone_track { .as_ref()
.and_then(|live_kit| match &live_kit.microphone_track {
LocalTrack::None => None, LocalTrack::None => None,
LocalTrack::Pending { muted, .. } => Some(*muted), LocalTrack::Pending { muted, .. } => Some(*muted),
LocalTrack::Published { muted, .. } => Some(*muted), LocalTrack::Published { muted, .. } => Some(*muted),
} })
})
} }
pub fn is_deafened(&self) -> Option<bool> { pub fn is_deafened(&self) -> Option<bool> {
self.live_kit.as_ref().map(|live_kit| { self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
live_kit.deafened
})
} }
pub fn share_mic(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> { pub fn share_mic(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {