diff --git a/src/renderer/components/ScreenSharePicker.tsx b/src/renderer/components/ScreenSharePicker.tsx index 1c53b63..253fccc 100644 --- a/src/renderer/components/ScreenSharePicker.tsx +++ b/src/renderer/components/ScreenSharePicker.tsx @@ -193,11 +193,15 @@ function StreamSettings({ ); return ( -
+
What you're streaming - + {source.name} @@ -283,23 +287,22 @@ function StreamSettings({

+ {isWindows && ( + setSettings(s => ({ ...s, audio: checked }))} + hideBorder + className="vcd-screen-picker-audio" + > + Stream With Audio + + )}
- {isWindows && ( - setSettings(s => ({ ...s, audio: checked }))} - hideBorder - className="vcd-screen-picker-audio" - > - Stream With Audio - - )} - {isLinux && ( VesktopNative.virtmic.list(), { - fallbackValue: { ok: true, targets: [], hasPipewirePulse: true } + fallbackValue: { ok: true, targets: [] } }); - const allSources = sources.ok ? ["None", "Entire System", ...sources.targets] : null; - const hasPipewirePulse = sources.ok ? sources.hasPipewirePulse : true; - - const [ignorePulseWarning, setIgnorePulseWarning] = useState(false); return ( <> @@ -349,38 +348,32 @@ function AudioSourcePickerLinux({ Audio Source )} - {!sources.ok && sources.isGlibCxxOutdated && ( - - Failed to retrieve Audio Sources because your C++ library is too old to run - - venmic - - . See{" "} - - this guide - {" "} - for possible solutions. - - )} + {!sources.ok && + (sources.isGlibcxxToOld ? ( + + Failed to retrieve Audio Sources because your C++ library is too old to run venmic. If you + would like to stream with Audio, see{" "} + + this guide + + + ) : ( + + Failed to retrieve Audio Sources. If you would like to stream with Audio, make sure you're + using Pipewire, not Pulseaudio + + ))} - {hasPipewirePulse || ignorePulseWarning ? ( - allSources && ( - ({ label: s, value: s, default: s === "None" }))} + isSelected={s => s === audioSource} + select={setAudioSource} + serialize={String} + /> )} diff --git a/src/renderer/components/screenSharePicker.css b/src/renderer/components/screenSharePicker.css index 9233837..c2586a1 100644 --- a/src/renderer/components/screenSharePicker.css +++ b/src/renderer/components/screenSharePicker.css @@ -17,7 +17,7 @@ grid-template-columns: 1fr 1fr; } -.vcd-screen-picker-settings-grid > div { +.vcd-screen-picker-settings-grid>div { display: flex; flex-direction: column; } @@ -67,11 +67,16 @@ box-sizing: border-box; } -.vcd-screen-picker-preview img { +.vcd-screen-picker-preview-img-linux { width: 100%; margin-bottom: 0.5em; } +.vcd-screen-picker-preview-img { + width: 90%; + margin-bottom: 0.5em; +} + .vcd-screen-picker-preview { display: flex; flex-direction: column;