devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ScreenShare): review comments, add default audio source (fixes #638)

Browse source
This commit is contained in:
Curve 2024-06-06 23:49:24 +02:00
parent 564665a2a7
commit b892315697
No known key found for this signature in database
GPG key ID: 460F6C466BD35813
3 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main/venmic.ts
View file

@ -71,8 +71,10 @@ function getRendererAudioServicePid() {
ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
const audioPid = getRendererAudioServicePid();
const { granularSelect } = Settings.store.audio ?? {};
const targets = obtainVenmic()
?.list(Settings.store.audioGranularSelect ? ["application.process.id"] : undefined)
?.list(granularSelect ? ["application.process.id"] : undefined)
.filter(s => s["application.process.id"] !== audioPid);
return targets ? { ok: true, targets, hasPipewirePulse } : { ok: false, isGlibCxxOutdated };
@ -80,23 +82,23 @@ ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, include: Node[]) => {
const pid = getRendererAudioServicePid();
const settings = Settings.store;
const { ignoreDevices, ignoreInputMedia, ignoreVirtual, workaround } = Settings.store.audio ?? {};
const data: LinkData = {
include: include,
exclude: [{ "application.process.id": pid }],
ignore_devices: settings.audioIgnoreDevices
ignore_devices: ignoreDevices
};
if (settings.audioIgnoreInputMedia ?? true) {
data.exclude?.push({ "media.class": "Stream/Input/Audio" });
if (ignoreInputMedia ?? true) {
data.exclude!.push({ "media.class": "Stream/Input/Audio" });
}
if (settings.audioIgnoreVirtual) {
data.exclude?.push({ "node.virtual": "true" });
if (ignoreVirtual) {
data.exclude!.push({ "node.virtual": "true" });
}
if (settings.audioWorkaround) {
if (workaround) {
data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
}
@ -105,24 +107,26 @@ ipcMain.handle(IpcEvents.VIRT_MIC_START, (_, include: Node[]) => {
ipcMain.handle(IpcEvents.VIRT_MIC_START_SYSTEM, (_, exclude: Node[]) => {
const pid = getRendererAudioServicePid();
const settings = Settings.store;
const { workaround, ignoreDevices, ignoreInputMedia, ignoreVirtual, onlySpeakers, onlyDefaultSpeakers } =
Settings.store.audio ?? {};
const data: LinkData = {
exclude: [{ "application.process.id": pid }, ...exclude],
only_speakers: settings.audioOnlySpeakers,
ignore_devices: settings.audioIgnoreDevices,
only_default_speakers: settings.audioOnlyDefaultSpeakers
only_speakers: onlySpeakers,
ignore_devices: ignoreDevices,
only_default_speakers: onlyDefaultSpeakers
};
if (settings.audioIgnoreInputMedia ?? true) {
data.exclude?.push({ "media.class": "Stream/Input/Audio" });
if (ignoreInputMedia ?? true) {
data.exclude.push({ "media.class": "Stream/Input/Audio" });
}
if (settings.audioIgnoreVirtual) {
data.exclude?.push({ "node.virtual": "true" });
if (ignoreVirtual) {
data.exclude.push({ "node.virtual": "true" });
}
if (settings.audioWorkaround) {
if (workaround) {
data.workaround = [{ "application.process.id": pid, "media.name": "RecordStream" }];
}

33
src/renderer/components/ScreenSharePicker.tsx
View file

@ -194,8 +194,8 @@ function AudioSettingsModal({
<Modals.ModalContent className="vcd-screen-picker-modal">
<Switch
hideBorder
onChange={v => (Settings.audioWorkaround = v)}
value={Settings.audioWorkaround ?? false}
onChange={v => (Settings.audio = { ...Settings.audio, workaround: v })}
value={Settings.audio?.workaround ?? false}
note={
<>
Work around an issue that causes the microphone to be shared instead of the correct audio.
@ -207,8 +207,8 @@ function AudioSettingsModal({
</Switch>
<Switch
hideBorder
onChange={v => (Settings.audioOnlySpeakers = v)}
value={Settings.audioOnlySpeakers ?? true}
onChange={v => (Settings.audio = { ...Settings.audio, onlySpeakers: v })}
value={Settings.audio?.onlySpeakers ?? true}
note={
<>
When sharing entire desktop audio, only share apps that play to a speaker. You may want to
@ -220,8 +220,8 @@ function AudioSettingsModal({
</Switch>
<Switch
hideBorder
onChange={v => (Settings.audioOnlyDefaultSpeakers = v)}
value={Settings.audioOnlyDefaultSpeakers ?? true}
onChange={v => (Settings.audio = { ...Settings.audio, onlyDefaultSpeakers: v })}
value={Settings.audio?.onlyDefaultSpeakers ?? true}
note={
<>
When sharing entire desktop audio, only share apps that play to the <b>default</b> speakers.
@ -233,16 +233,16 @@ function AudioSettingsModal({
</Switch>
<Switch
hideBorder
onChange={v => (Settings.audioIgnoreInputMedia = v)}
value={Settings.audioIgnoreInputMedia ?? true}
onChange={v => (Settings.audio = { ...Settings.audio, ignoreInputMedia: v })}
value={Settings.audio?.ignoreInputMedia ?? true}
note={<>Exclude nodes that are intended to capture audio.</>}
>
Ignore Inputs
</Switch>
<Switch
hideBorder
onChange={v => (Settings.audioIgnoreVirtual = v)}
value={Settings.audioIgnoreVirtual ?? false}
onChange={v => (Settings.audio = { ...Settings.audio, ignoreVirtual: v })}
value={Settings.audio?.ignoreVirtual ?? false}
note={
<>
Exclude virtual nodes, such as nodes belonging to loopbacks. This might be useful when using
@ -254,8 +254,8 @@ function AudioSettingsModal({
</Switch>
<Switch
hideBorder
onChange={v => (Settings.audioIgnoreDevices = v)}
value={Settings.audioIgnoreDevices ?? true}
onChange={v => (Settings.audio = { ...Settings.audio, ignoreDevices: v })}
value={Settings.audio?.ignoreDevices ?? true}
note={<>Exclude device nodes, such as nodes belonging to microphones or speakers.</>}
>
Ignore Devices
@ -263,10 +263,10 @@ function AudioSettingsModal({
<Switch
hideBorder
onChange={value => {
Settings.audioGranularSelect = value;
Settings.audio = { ...Settings.audio, granularSelect: value };
setAudioSources("None");
}}
value={Settings.audioGranularSelect ?? false}
value={Settings.audio?.granularSelect ?? false}
note={<>Allow to select applications more granularly.</>}
>
Granular Selection
@ -423,7 +423,7 @@ function StreamSettings({
openSettings={openSettings}
includeSources={settings.includeSources}
excludeSources={settings.excludeSources}
granularSelect={Settings.audioGranularSelect}
granularSelect={Settings.audio?.granularSelect}
setIncludeSources={sources => setSettings(s => ({ ...s, includeSources: sources }))}
setExcludeSources={sources => setSettings(s => ({ ...s, excludeSources: sources }))}
/>
@ -664,7 +664,8 @@ function ModalComponent({
resolution: "1080",
fps: "60",
contentHint: "motion",
audio: true
audio: true,
audioSources: "None"
});
return (

16
src/shared/settings.d.ts vendored
View file

@ -31,15 +31,17 @@ export interface Settings {
spellCheckLanguages?: string[];
audioWorkaround?: boolean;
audioGranularSelect?: boolean;
audio?: {
workaround?: boolean;
granularSelect?: boolean;
audioIgnoreVirtual?: boolean;
audioIgnoreDevices?: boolean;
audioIgnoreInputMedia?: boolean;
ignoreVirtual?: boolean;
ignoreDevices?: boolean;
ignoreInputMedia?: boolean;
audioOnlySpeakers?: boolean;
audioOnlyDefaultSpeakers?: boolean;
onlySpeakers?: boolean;
onlyDefaultSpeakers?: boolean;
};
}
export interface State {