fix echo screenshare

Nerimity · Oct 12, 2024 · e4ecaa4 · e4ecaa4
1 parent eb48750
commit e4ecaa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/src/common/Electron.ts b/src/common/Electron.ts
@@ -40,6 +40,7 @@ interface WindowAPI {
 
   setNotification(value: boolean): void;
   getDesktopCaptureSources(): Promise<ElectronCaptureSource[]>;
+  setDesktopCaptureSourceId(sourceId: string): void;
 
   getRunningPrograms(ignoredPrograms?: Program[]): Promise<Program[]>;
   restartActivityStatus(listenToPrograms: Program[]): void;

diff --git a/src/components/main-pane-header/ScreenShareModal.tsx b/src/components/main-pane-header/ScreenShareModal.tsx
@@ -54,32 +54,13 @@ export function ScreenShareModal(props: { close: () => void }) {
 
     if (electronWindowAPI()?.isElectron) {
       const sourceId = electronSourceIdRef();
-      if (!sourceId) return;
-      stream = await navigator.mediaDevices.getUserMedia({
-        audio: {
-          mandatory: {
-            chromeMediaSource: "desktop",
-          },
-        },
-        video: {
-          mandatory: {
-            chromeMediaSource: "desktop",
-            chromeMediaSourceId: sourceId,
-            maxFrameRate: constraints.video.frameRate,
-            minWidth: constraints.video.width,
-            maxWidth: constraints.video.width,
-            minHeight: constraints.video.height,
-            maxHeight: constraints.video.height,
-          },
-        },
-      });
-      await stream.getAudioTracks()[0].applyConstraints(constraints.audio);
-    } else {
-      stream = await navigator.mediaDevices
-        .getDisplayMedia(constraints)
-        .catch(() => {});
+      electronWindowAPI()?.setDesktopCaptureSourceId(sourceId);
     }
 
+    stream = await navigator.mediaDevices
+      .getDisplayMedia(constraints)
+      .catch(() => {});
+
     if (!stream) return;
     voiceUsers.setVideoStream(stream);
     props.close();