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

fmt

Browse source
This commit is contained in:
Mikayla Maki 2023-06-27 19:25:46 -07:00
parent 5d02b49058
commit 749f60ba81
No known key found for this signature in database
4 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -88,8 +88,9 @@ impl View for CollabTitlebarItem {
right_container.add_child(self.render_leave_call(&theme, cx)); right_container.add_child(self.render_leave_call(&theme, cx));
let muted = room.read(cx).is_muted(); let muted = room.read(cx).is_muted();
let speaking = room.read(cx).is_speaking(); let speaking = room.read(cx).is_speaking();
left_container left_container.add_child(
.add_child(self.render_current_user(&workspace, &theme, &user, peer_id, muted, speaking, cx)); self.render_current_user(&workspace, &theme, &user, peer_id, muted, speaking, cx),
);
left_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx)); left_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
right_container.add_child(self.render_toggle_mute(&theme, &room, cx)); right_container.add_child(self.render_toggle_mute(&theme, &room, cx));
right_container.add_child(self.render_toggle_deafen(&theme, &room, cx)); right_container.add_child(self.render_toggle_deafen(&theme, &room, cx));

5
crates/live_kit_client/examples/test_app.rs
View file

@ -110,10 +110,7 @@ fn main() {
// Clear out any active speakers changed messages // Clear out any active speakers changed messages
let mut next = audio_track_updates.next().await.unwrap(); let mut next = audio_track_updates.next().await.unwrap();
while let RemoteAudioTrackUpdate::ActiveSpeakersChanged { while let RemoteAudioTrackUpdate::ActiveSpeakersChanged { speakers } = next {
speakers
} = next
{
println!("Speakers changed: {:?}", speakers); println!("Speakers changed: {:?}", speakers);
next = audio_track_updates.next().await.unwrap(); next = audio_track_updates.next().await.unwrap();
} }

16
crates/live_kit_client/src/prod.rs
View file

@ -402,10 +402,14 @@ impl Room {
// A vec of publisher IDs // A vec of publisher IDs
fn active_speakers_changed(&self, speakers: Vec<String>) { fn active_speakers_changed(&self, speakers: Vec<String>) {
self.remote_audio_track_subscribers.lock().retain(move |tx| { self.remote_audio_track_subscribers
tx.unbounded_send(RemoteAudioTrackUpdate::ActiveSpeakersChanged { speakers: speakers.clone() }) .lock()
.retain(move |tx| {
tx.unbounded_send(RemoteAudioTrackUpdate::ActiveSpeakersChanged {
speakers: speakers.clone(),
})
.is_ok() .is_ok()
}); });
} }
fn did_subscribe_to_remote_video_track(&self, track: RemoteVideoTrack) { fn did_subscribe_to_remote_video_track(&self, track: RemoteVideoTrack) {
@ -544,7 +548,11 @@ impl RoomDelegate {
let speakers = unsafe { let speakers = unsafe {
CFArray::wrap_under_get_rule(participants) CFArray::wrap_under_get_rule(participants)
.into_iter() .into_iter()
.map(|speaker: core_foundation::base::ItemRef<'_, *const c_void>| CFString::wrap_under_get_rule(*speaker as CFStringRef).to_string()) .map(
|speaker: core_foundation::base::ItemRef<'_, *const c_void>| {
CFString::wrap_under_get_rule(*speaker as CFStringRef).to_string()
},
)
.collect() .collect()
}; };

2
crates/live_kit_client/src/test.rs
View file

@ -581,7 +581,7 @@ pub enum RemoteVideoTrackUpdate {
#[derive(Clone)] #[derive(Clone)]
pub enum RemoteAudioTrackUpdate { pub enum RemoteAudioTrackUpdate {
ActiveSpeakersChanged { speakers: Vec<Sid> }, ActiveSpeakersChanged { speakers: Vec<Sid> },
MuteChanged { track_id: Sid, muted: bool}, MuteChanged { track_id: Sid, muted: bool },
Subscribed(Arc<RemoteAudioTrack>), Subscribed(Arc<RemoteAudioTrack>),
Unsubscribed { publisher_id: Sid, track_id: Sid }, Unsubscribed { publisher_id: Sid, track_id: Sid },
} }