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

Handle no local media (yet)

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-11-07 17:53:44 +00:00
parent 238797aed8
commit c37c2e50bd
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/state/CallViewModel.ts
View File

@@ -598,11 +598,6 @@ export class CallViewModel extends ViewModel {
),
);
private readonly localUserMedia: Observable<LocalUserMediaViewModel> =
this.mediaItems.pipe(
map((ms) => ms.find((m) => m.vm.local)!.vm as LocalUserMediaViewModel),
);
private readonly screenShares: Observable<ScreenShare[]> =
this.mediaItems.pipe(
map((mediaItems) =>
@@ -699,12 +694,19 @@ export class CallViewModel extends ViewModel {
speaker
? speaker.local
? of(undefined)
: this.localUserMedia.pipe(
switchMap((vm) =>
vm.alwaysShow.pipe(
map((alwaysShow) => (alwaysShow ? vm : undefined)),
),
),
: this.mediaItems.pipe(
switchMap((mediaItems) => {
const localUserMedia = mediaItems.find(
(m) => m.vm instanceof LocalUserMediaViewModel,
) as LocalUserMediaViewModel | undefined;
return (
localUserMedia?.alwaysShow?.pipe(
map((alwaysShow) =>
alwaysShow ? localUserMedia : undefined,
),
) ?? of(undefined)
);
}),
)
: of(undefined),
),
@@ -850,9 +852,17 @@ export class CallViewModel extends ViewModel {
| RemoteUserMediaViewModel
| undefined;
if (!local || !remote) {
throw new Error(
"Invalid state: there should be local and remote media for one-on-one layout",
logger.warn(
`Falling back to grid layout for one-on-one layout with missing media: local=${!!local} remote=${!!remote}`,
);
return {
type: "grid",
grid: grid.filter(
(m) =>
m instanceof LocalUserMediaViewModel ||
m instanceof RemoteUserMediaViewModel,
),
};
}
return {
type: "one-on-one",