screenaudio: show better error if glibcxx too old

Vencord · Oct 26, 2023 · 886d02f · 886d02f
1 parent 0cad71f
commit 886d02f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/src/main/virtmic.ts b/src/main/virtmic.ts
@@ -11,6 +11,7 @@ import { STATIC_DIR } from "shared/paths";
 
 let initialized = false;
 let patchBay: import("@vencord/venmic").PatchBay | undefined;
+let isGlibcxxToOld = false;
 
 function getRendererAudioServicePid() {
     return (
@@ -27,8 +28,9 @@ function obtainVenmic() {
         try {
             const { PatchBay } = require(join(STATIC_DIR, "dist/venmic.node")) as typeof import("@vencord/venmic");
             patchBay = new PatchBay();
-        } catch (e) {
+        } catch (e: any) {
             console.error("Failed to initialise venmic. Make sure you're using pipewire", e);
+            isGlibcxxToOld = (e?.stack || e?.message || "").toLowerCase().includes("glibc");
         }
     }
 
@@ -42,8 +44,9 @@ ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
         .filter(s => s["application.process.id"] !== audioPid)
         .map(s => s["application.name"]);
 
-    // Remove duplicates
-    return list && [...new Set(list)];
+    return list
+        ? { ok: true, targets: [...new Set(list)] } // Remove duplicates
+        : { ok: false, isGlibcxxToOld };
 });
 
 ipcMain.handle(

diff --git a/src/preload/VesktopNative.ts b/src/preload/VesktopNative.ts
@@ -61,7 +61,8 @@ export const VesktopNative = {
     },
     /** only available on Linux. */
     virtmic: {
-        list: () => invoke<string[] | null>(IpcEvents.VIRT_MIC_LIST),
+        list: () =>
+            invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST),
         start: (target: string) => invoke<void>(IpcEvents.VIRT_MIC_START, target),
         startSystem: () => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM),
         stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)

diff --git a/src/renderer/components/ScreenSharePicker.tsx b/src/renderer/components/ScreenSharePicker.tsx
@@ -240,19 +240,30 @@ function AudioSourcePickerLinux({
     audioSource?: string;
     setAudioSource(s: string): void;
 }) {
-    const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), { fallbackValue: [] });
-    const allSources = sources ? ["None", "Entire System", ...sources] : null;
+    const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), {
+        fallbackValue: { ok: true, targets: [] }
+    });
+    const allSources = sources.ok ? ["None", "Entire System", ...sources.targets] : null;
 
     return (
         <section>
             <Forms.FormTitle>Audio</Forms.FormTitle>
             {loading && <Forms.FormTitle>Loading Audio sources...</Forms.FormTitle>}
-            {allSources === null && (
-                <Forms.FormTitle>
-                    Failed to retrieve Audio Sources. If you would like to stream with Audio, make sure you're using
-                    Pipewire, not Pulseaudio
-                </Forms.FormTitle>
-            )}
+            {!sources.ok &&
+                (sources.isGlibcxxToOld ? (
+                    <Forms.FormText>
+                        Failed to retrieve Audio Sources because your c++ library is too old to run venmic. If you would
+                        like to stream with Audio, see{" "}
+                        <a href="https://gist.github.com/Vendicated/b655044ffbb16b2716095a448c6d827a" target="_blank">
+                            this guide
+                        </a>
+                    </Forms.FormText>
+                ) : (
+                    <Forms.FormText>
+                        Failed to retrieve Audio Sources. If you would like to stream with Audio, make sure you're using
+                        Pipewire, not Pulseaudio
+                    </Forms.FormText>
+                ))}
 
             {allSources && (
                 <Select