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

Merge branch 'main' into unblur-shiggy-splash

Browse source
This commit is contained in:
viacoro 2023-11-19 16:04:57 +01:00 committed by GitHub
commit d912d2c41b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -26,7 +26,7 @@
"arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d" "arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d"
}, },
"optionalDependencies": { "optionalDependencies": {
"@vencord/venmic": "^1.7.0" "@vencord/venmic": "^2.1.2"
}, },
"devDependencies": { "devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2", "@fal-works/esbuild-plugin-global-externals": "^2.1.2",

14
pnpm-lock.yaml
View file

@ -11,8 +11,8 @@ dependencies:
optionalDependencies: optionalDependencies:
'@vencord/venmic': '@vencord/venmic':
specifier: ^1.7.0 specifier: ^2.1.2
version: 1.7.0 version: 2.1.2
devDependencies: devDependencies:
'@fal-works/esbuild-plugin-global-externals': '@fal-works/esbuild-plugin-global-externals':
@ -960,8 +960,8 @@ packages:
type-fest: 3.13.1 type-fest: 3.13.1
dev: true dev: true
/@vencord/venmic@1.7.0: /@vencord/venmic@2.1.2:
resolution: {integrity: sha512-WtIfoPaFWMU0Q98KQx9BTjTQQgevb0hwpTiJTDi5uL274JRSt5lm/J5qIwsYrPNsvLv0AJvyUV0Zc8dU+hUc5w==} resolution: {integrity: sha512-2++ozTgEVORoJ0kJ1DpFy7MJVLoG3qD503CKqG4Ztm7fUCWyxXICWDBdtCIsFzVZCBfScz+c9XXae4gXRBeJ3Q==}
engines: {node: '>=14.15'} engines: {node: '>=14.15'}
os: [linux] os: [linux]
requiresBuild: true requiresBuild: true
@ -1219,8 +1219,8 @@ packages:
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
dev: true dev: true
/axios@1.5.1(debug@4.3.4): /axios@1.6.1(debug@4.3.4):
resolution: {integrity: sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==} resolution: {integrity: sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==}
requiresBuild: true requiresBuild: true
dependencies: dependencies:
follow-redirects: 1.15.3(debug@4.3.4) follow-redirects: 1.15.3(debug@4.3.4)
@ -1471,7 +1471,7 @@ packages:
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true
dependencies: dependencies:
axios: 1.5.1(debug@4.3.4) axios: 1.6.1(debug@4.3.4)
debug: 4.3.4 debug: 4.3.4
fs-extra: 10.1.0 fs-extra: 10.1.0
lodash.isplainobject: 4.0.6 lodash.isplainobject: 4.0.6

4
src/main/utils/steamOS.ts
View file

@ -15,9 +15,9 @@ import { Settings } from "../settings";
const exec = promisify(callbackExec); const exec = promisify(callbackExec);
// Bump this to re-show the prompt // Bump this to re-show the prompt
const layoutVersion = 1; const layoutVersion = 2;
// Get this from "show details" on the profile after exporting as a shared personal layout or using share with community // Get this from "show details" on the profile after exporting as a shared personal layout or using share with community
const layoutId = "3063409873"; // Vesktop Layout v1 const layoutId = "3080264545"; // Vesktop Layout v2
const numberRegex = /^[0-9]*$/; const numberRegex = /^[0-9]*$/;
export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1"; export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1";

13
src/main/virtmic.ts
View file

@ -53,10 +53,9 @@ ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
ipcMain.handle( ipcMain.handle(
IpcEvents.VIRT_MIC_START, IpcEvents.VIRT_MIC_START,
(_, target: string) => (_, targets: string[]) =>
obtainVenmic()?.link({ obtainVenmic()?.link({
key: "application.name", props: targets.map(target => ({ key: "application.name", value: target })),
value: target,
mode: "include" mode: "include"
}) })
); );
@ -65,8 +64,12 @@ ipcMain.handle(
IpcEvents.VIRT_MIC_START_SYSTEM, IpcEvents.VIRT_MIC_START_SYSTEM,
() => () =>
obtainVenmic()?.link({ obtainVenmic()?.link({
key: "application.process.id", props: [
value: getRendererAudioServicePid(), {
key: "application.process.id",
value: getRendererAudioServicePid()
}
],
mode: "exclude" mode: "exclude"
}) })
); );

2
src/preload/VesktopNative.ts
View file

@ -63,7 +63,7 @@ export const VesktopNative = {
virtmic: { virtmic: {
list: () => list: () =>
invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST), invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST),
start: (target: string) => invoke<void>(IpcEvents.VIRT_MIC_START, target), start: (targets: string[]) => invoke<void>(IpcEvents.VIRT_MIC_START, targets),
startSystem: () => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM), startSystem: () => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM),
stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP) stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)
}, },

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

@ -106,7 +106,7 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
if (v.audioSource === "Entire System") { if (v.audioSource === "Entire System") {
await VesktopNative.virtmic.startSystem(); await VesktopNative.virtmic.startSystem();
} else { } else {
await VesktopNative.virtmic.start(v.audioSource); await VesktopNative.virtmic.start([v.audioSource]);
} }
} }
resolve(v); resolve(v);