Venmic v3.4 (#499)

2024-04-14 02:24:19 +02:00 · 2024-04-14 02:24:19 +02:00 · df05d12fb2
commit df05d12fb2
parent 8c6941b8e9
6 changed files with 149 additions and 102 deletions
--- a/package.json
+++ b/package.json
@ -27,7 +27,7 @@
        "arrpc": "github:OpenAsar/arrpc#98879cae0565e6fce34e4cb6f544bf42c6a7e7c8"
    },
    "optionalDependencies": {
-        "@vencord/venmic": "^3.3.3"
+        "@vencord/venmic": "^3.4.1"
    },
    "devDependencies": {
        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -11,8 +11,8 @@ dependencies:

 optionalDependencies:
  '@vencord/venmic':
-    specifier: ^3.3.3
-    version: 3.3.3
+    specifier: ^3.4.1
+    version: 3.4.1

 devDependencies:
  '@fal-works/esbuild-plugin-global-externals':
@ -1000,8 +1000,8 @@ packages:
      type-fest: 3.13.1
    dev: true

-  /@vencord/venmic@3.3.3:
-    resolution: {integrity: sha512-qC3fPAUtw8j5L6uV3m9BGEnKpuOAlrYeZzFgILF3bFnDNFE9ANJsYttoHt80laBU7C1Xo56tHG2vVpLBsH+sgw==}
+  /@vencord/venmic@3.4.1:
+    resolution: {integrity: sha512-PkMXx53nxiYBLWxiMRaBjBm8aTTJTcueKsMZ0v35TtIQ93yfuSzfCilDFLs3kYz1uQHArTaI9IGQykgmSfe/2w==}
    engines: {node: '>=14.15'}
    os: [linux]
    requiresBuild: true
@ -1333,11 +1333,11 @@ packages:
      possible-typed-array-names: 1.0.0
    dev: true

-  /axios@1.6.7(debug@4.3.4):
-    resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
+  /axios@1.6.8(debug@4.3.4):
+    resolution: {integrity: sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==}
    requiresBuild: true
    dependencies:
-      follow-redirects: 1.15.5(debug@4.3.4)
+      follow-redirects: 1.15.6(debug@4.3.4)
      form-data: 4.0.0
      proxy-from-env: 1.1.0
    transitivePeerDependencies:
@ -1576,7 +1576,7 @@ packages:
    hasBin: true
    requiresBuild: true
    dependencies:
-      axios: 1.6.7(debug@4.3.4)
+      axios: 1.6.8(debug@4.3.4)
      debug: 4.3.4
      fs-extra: 11.2.0
      lodash.isplainobject: 4.0.6
@ -2540,8 +2540,8 @@ packages:
    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
    dev: true

-  /follow-redirects@1.15.5(debug@4.3.4):
-    resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==}
+  /follow-redirects@1.15.6(debug@4.3.4):
+    resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
    engines: {node: '>=4.0'}
    requiresBuild: true
    peerDependencies:
--- a/src/main/venmic.ts
+++ b/src/main/venmic.ts
@ -72,11 +72,12 @@ ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, targets: string[], workaround?: boo
    return obtainVenmic()?.link(data);
 });

-ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, workaround?: boolean) => {
+ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, workaround?: boolean, onlyDefaultSpeakers?: boolean) => {
    const pid = getRendererAudioServicePid();

    const data: LinkData = {
-        exclude: [{ key: "application.process.id", value: pid }]
+        exclude: [{ key: "application.process.id", value: pid }],
+        only_default_speakers: onlyDefaultSpeakers
    };

    if (workaround) {
--- a/src/preload/VesktopNative.ts
+++ b/src/preload/VesktopNative.ts
@ -64,7 +64,8 @@ export const VesktopNative = {
        list: () =>
            invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST),
        start: (targets: string[], workaround?: boolean) => invoke<void>(IpcEvents.VIRT_MIC_START, targets, workaround),
-        startSystem: (workaround?: boolean) => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM, workaround),
+        startSystem: (workaround?: boolean, onlyDefaultSpeakers?: boolean) =>
+            invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM, workaround, onlyDefaultSpeakers),
        stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)
    },
    arrpc: {
--- a/src/renderer/components/ScreenSharePicker.tsx
+++ b/src/renderer/components/ScreenSharePicker.tsx
@ -6,7 +6,7 @@

 import "./screenSharePicker.css";

-import { closeModal, Margins, Modals, openModal, useAwaiter } from "@vencord/types/utils";
+import { closeModal, Margins, Modals, ModalSize, openModal, useAwaiter } from "@vencord/types/utils";
 import { findStoreLazy, onceReady } from "@vencord/types/webpack";
 import {
    Button,
@ -37,6 +37,7 @@ interface StreamSettings {
    audio: boolean;
    audioSource?: string;
    workaround?: boolean;
+    onlyDefaultSpeakers?: boolean;
 }

 export interface StreamPick extends StreamSettings {
@ -167,6 +168,7 @@ function StreamSettings({
    );

    return (
+        <div className="vcd-screen-picker-settings-grid">
            <div>
                <Forms.FormTitle>What you're streaming</Forms.FormTitle>
                <Card className="vcd-screen-picker-card vcd-screen-picker-preview">
@ -182,7 +184,10 @@ function StreamSettings({
                            <Forms.FormTitle>Resolution</Forms.FormTitle>
                            <div className="vcd-screen-picker-radios">
                                {StreamResolutions.map(res => (
-                                <label className="vcd-screen-picker-radio" data-checked={settings.resolution === res}>
+                                    <label
+                                        className="vcd-screen-picker-radio"
+                                        data-checked={settings.resolution === res}
+                                    >
                                        <Text variant="text-sm/bold">{res}</Text>
                                        <input
                                            type="radio"
@ -214,7 +219,10 @@ function StreamSettings({
                            </div>
                        </section>
                    </div>
+                </Card>
+            </div>

+            <div>
                {isWindows && (
                    <Switch
                        value={settings.audio}
@ -230,11 +238,13 @@ function StreamSettings({
                    <AudioSourcePickerLinux
                        audioSource={settings.audioSource}
                        workaround={settings.workaround}
+                        onlyDefaultSpeakers={settings.onlyDefaultSpeakers}
                        setAudioSource={source => setSettings(s => ({ ...s, audioSource: source }))}
-                        setWorkaround={workaround => setSettings(s => ({ ...s, workaround: workaround }))}
+                        setWorkaround={value => setSettings(s => ({ ...s, workaround: value }))}
+                        setOnlyDefaultSpeakers={value => setSettings(s => ({ ...s, onlyDefaultSpeakers: value }))}
                    />
                )}
-            </Card>
+            </div>
        </div>
    );
 }
@ -242,13 +252,17 @@ function StreamSettings({
 function AudioSourcePickerLinux({
    audioSource,
    workaround,
+    onlyDefaultSpeakers,
    setAudioSource,
-    setWorkaround
+    setWorkaround,
+    setOnlyDefaultSpeakers
 }: {
    audioSource?: string;
    workaround?: boolean;
+    onlyDefaultSpeakers?: boolean;
    setAudioSource(s: string): void;
    setWorkaround(b: boolean): void;
+    setOnlyDefaultSpeakers(b: boolean): void;
 }) {
    const [sources, _, loading] = useAwaiter(() => VesktopNative.virtmic.list(), {
        fallbackValue: { ok: true, targets: [] }
@ -256,22 +270,31 @@ function AudioSourcePickerLinux({
    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>}
+        <>
+            <Forms.FormTitle>Audio Settings</Forms.FormTitle>
+            <Card className="vcd-screen-picker-card">
+                {loading ? (
+                    <Forms.FormTitle>Loading Audio Sources...</Forms.FormTitle>
+                ) : (
+                    <Forms.FormTitle>Audio Source</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">
+                            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
+                            Failed to retrieve Audio Sources. If you would like to stream with Audio, make sure you're
+                            using Pipewire, not Pulseaudio
                        </Forms.FormText>
                    ))}

@ -291,14 +314,30 @@ function AudioSourcePickerLinux({
                    value={workaround ?? false}
                    note={
                        <>
-                        Work around an issue that causes the microphone to be shared instead of the correct audio. Only
-                        enable if you're experiencing this issue.
+                            Work around an issue that causes the microphone to be shared instead of the correct audio.
+                            Only enable if you're experiencing this issue.
                        </>
                    }
                >
                    Microphone Workaround
                </Switch>
-        </section>
+
+                <Switch
+                    hideBorder
+                    onChange={setOnlyDefaultSpeakers}
+                    disabled={audioSource !== "Entire System"}
+                    value={onlyDefaultSpeakers ?? true}
+                    note={
+                        <>
+                            When sharing entire desktop audio, only share apps that play to the default speakers and
+                            ignore apps that play to other speakers or devices.
+                        </>
+                    }
+                >
+                    Only Default Speakers
+                </Switch>
+            </Card>
+        </>
    );
 }

@ -323,7 +362,7 @@ function ModalComponent({
    });

    return (
-        <Modals.ModalRoot {...modalProps}>
+        <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
            <Modals.ModalHeader className="vcd-screen-picker-header">
                <Forms.FormTitle tag="h2">ScreenShare</Forms.FormTitle>
                <Modals.ModalCloseButton onClick={close} />
--- a/src/renderer/components/screenSharePicker.css
+++ b/src/renderer/components/screenSharePicker.css
@ -11,6 +11,12 @@
    gap: 1em;
 }

+.vcd-screen-picker-settings-grid {
+    gap: 1em;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+}
+
 .vcd-screen-picker-grid {
    display: grid;
    grid-template-columns: 1fr 1fr;