Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-03-31 07:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-11-07 13:01:48 +00:00
parent 0760796024
commit 95effe0852
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/state/CallViewModel.ts
View File

@@ -443,7 +443,7 @@ export class CallViewModel extends ViewModel {
remoteParticipants,
{ participant: localParticipant },
duplicateTiles,
_participantChange,
_membershipsChanged,
nonMemberTiles,
],
) => {
@@ -682,16 +682,11 @@ export class CallViewModel extends ViewModel {
);
private readonly spotlightAndPip: Observable<
[Observable<MediaViewModel[]>, Observable<UserMediaViewModel | null>]
[Observable<MediaViewModel[]>, Observable<UserMediaViewModel | undefined>]
> = this.screenShares.pipe(
map((screenShares) =>
screenShares.length > 0
? ([
of(screenShares.map((m) => m.vm)),
this.spotlightSpeaker.pipe(
map((speaker) => (speaker && speaker) ?? null),
),
] as const)
? ([of(screenShares.map((m) => m.vm)), this.spotlightSpeaker] as const)
: ([
this.spotlightSpeaker.pipe(
map((speaker) => (speaker && [speaker]) ?? []),
@@ -700,15 +695,15 @@ export class CallViewModel extends ViewModel {
switchMap((speaker) =>
speaker
? speaker.local
? of(null)
? of(undefined)
: this.localUserMedia.pipe(
switchMap((vm) =>
vm.alwaysShow.pipe(
map((alwaysShow) => (alwaysShow ? vm : null)),
map((alwaysShow) => (alwaysShow ? vm : undefined)),
),
),
)
: of(null),
: of(undefined),
),
),
] as const),