First pass on fixes

This commit is contained in:
Piotr Osiewicz 2025-08-19 14:23:59 +02:00
parent 5826d89b97
commit 2f3be75fc7
269 changed files with 1593 additions and 2574 deletions

View file

@ -827,8 +827,8 @@ impl Room {
);
Audio::play_sound(Sound::Joined, cx);
if let Some(livekit_participants) = &livekit_participants {
if let Some(livekit_participant) = livekit_participants
if let Some(livekit_participants) = &livekit_participants
&& let Some(livekit_participant) = livekit_participants
.get(&ParticipantIdentity(user.id.to_string()))
{
for publication in
@ -847,7 +847,6 @@ impl Room {
}
}
}
}
}
}
@ -940,11 +939,10 @@ impl Room {
self.client.user_id()
)
})?;
if self.live_kit.as_ref().map_or(true, |kit| kit.deafened) {
if publication.is_audio() {
if self.live_kit.as_ref().map_or(true, |kit| kit.deafened)
&& publication.is_audio() {
publication.set_enabled(false, cx);
}
}
match track {
livekit_client::RemoteTrack::Audio(track) => {
cx.emit(Event::RemoteAudioTracksChanged {
@ -1005,11 +1003,10 @@ impl Room {
for (sid, participant) in &mut self.remote_participants {
participant.speaking = speaker_ids.binary_search(sid).is_ok();
}
if let Some(id) = self.client.user_id() {
if let Some(room) = &mut self.live_kit {
if let Some(id) = self.client.user_id()
&& let Some(room) = &mut self.live_kit {
room.speaking = speaker_ids.binary_search(&id).is_ok();
}
}
}
RoomEvent::TrackMuted {
@ -1042,19 +1039,15 @@ impl Room {
if let LocalTrack::Published {
track_publication, ..
} = &room.microphone_track
{
if track_publication.sid() == publication.sid() {
&& track_publication.sid() == publication.sid() {
room.microphone_track = LocalTrack::None;
}
}
if let LocalTrack::Published {
track_publication, ..
} = &room.screen_track
{
if track_publication.sid() == publication.sid() {
&& track_publication.sid() == publication.sid() {
room.screen_track = LocalTrack::None;
}
}
}
}
@ -1484,11 +1477,10 @@ impl Room {
self.set_deafened(deafened, cx);
if should_change_mute {
if let Some(task) = self.set_mute(deafened, cx) {
if should_change_mute
&& let Some(task) = self.set_mute(deafened, cx) {
task.detach_and_log_err(cx);
}
}
}
}