rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2528 from robintown/remote-spotlight

Browse Source 
More strongly prefer putting a remote speaker in the spotlight
This commit is contained in:
Robin
2024-08-01 13:24:57 -04:00
committed by GitHub
parent f9323d8b2c 5a0b81b57f
commit f89342713a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/state/CallViewModel.ts
View File

@@ -414,19 +414,23 @@ export class CallViewModel extends ViewModel {
), ),
), ),
scan<(readonly [UserMedia, boolean])[], UserMedia, null>( scan<(readonly [UserMedia, boolean])[], UserMedia, null>(
(prev, mediaItems) => (prev, mediaItems) => {
const stickyPrev = prev === null || prev.vm.local ? null : prev;
// Decide who to spotlight: // Decide who to spotlight:
// If the previous speaker (not the local user) is still speaking, // If the previous speaker (not the local user) is still speaking,
// stick with them rather than switching eagerly to someone else // stick with them rather than switching eagerly to someone else
(prev === null || prev.vm.local return (
? null mediaItems.find(([m, s]) => m === stickyPrev && s)?.[0] ??
: mediaItems.find(([m, s]) => m === prev && s)?.[0]) ??
// Otherwise, select any remote user who is speaking // Otherwise, select any remote user who is speaking
mediaItems.find(([m, s]) => !m.vm.local && s)?.[0] ?? mediaItems.find(([m, s]) => !m.vm.local && s)?.[0] ??
// Otherwise, stick with the person who was last speaking // Otherwise, stick with the person who was last speaking
prev ?? stickyPrev ??
// Otherwise, spotlight an arbitrary remote user
mediaItems.find(([m]) => !m.vm.local)?.[0] ??
// Otherwise, spotlight the local user // Otherwise, spotlight the local user
mediaItems.find(([m]) => m.vm.local)![0], mediaItems.find(([m]) => m.vm.local)![0]
);
},
null, null,
), ),
distinctUntilChanged(), distinctUntilChanged(),