matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Merge pull request #5525 from SimonBrandner/fix-screen-sharing

Browse Source 
Fix desktop Matrix screen sharing and add a screen/window picker
This commit is contained in:
David Baker
2021-02-08 13:54:51 +00:00
committed by GitHub
parent 91f2e4b5db 022781e9bc
commit cf5ec7720c
5 changed files with 252 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CallHandler.tsx
View File

@@ -82,6 +82,7 @@ import CountlyAnalytics from "./CountlyAnalytics";
import {UIFeature} from "./settings/UIFeature";
import { CallError } from "matrix-js-sdk/src/webrtc/call";
import { logger } from 'matrix-js-sdk/src/logger';
import DesktopCapturerSourcePicker from "./components/views/elements/DesktopCapturerSourcePicker"
import { Action } from './dispatcher/actions';
import { roomForVirtualRoom, getOrCreateVirtualRoomForRoom } from './VoipUserMapper';
import { addManagedHybridWidget, isManagedHybridWidgetEnabled } from './widgets/ManagedHybrid';
@@ -572,7 +573,15 @@ export default class CallHandler {
});
return;
}
call.placeScreenSharingCall(remoteElement, localElement);
call.placeScreenSharingCall(
remoteElement,
localElement,
async () : Promise<DesktopCapturerSource> => {
const {finished} = Modal.createDialog(DesktopCapturerSourcePicker);
const [source] = await finished;
return source;
});
} else {
console.error("Unknown conf call type: %s", type);
}