onyx_online/nvda-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-voicemeeter.git synced 2024-11-22 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

upd controller_path to reflect changes to pyinstaller

Browse Source 
patch  bump
This commit is contained in:
onyx-and-iris 2024-01-30 14:34:11 +00:00
parent b45b2da4aa
commit 79f739f250
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pdm.lock
View File

@ -5,7 +5,7 @@
groups = ["default", "build", "lint", "test"] groups = ["default", "build", "lint", "test"]
strategy = ["cross_platform"] strategy = ["cross_platform"]
lock_version = "4.4.1" lock_version = "4.4.1"
content_hash = "sha256:3fa263ac843989c1735416c5f86309c704b19653a99cfceb396e28e76dbc425f" content_hash = "sha256:6be74981983ee2ba3a99c9aa75b10f6c7433fec0854390f82029635cb34d3e0b"
[[package]] [[package]]
name = "altgraph" name = "altgraph"

8
pyproject.toml
View File

@ -1,6 +1,6 @@
[project] [project]
name = "nvda_voicemeeter" name = "nvda_voicemeeter"
version = "0.6.2" version = "0.6.3"
description = "A Voicemeeter app compatible with NVDA" description = "A Voicemeeter app compatible with NVDA"
authors = [ authors = [
{ name = "onyx-and-iris", email = "code@onyxandiris.online" }, { name = "onyx-and-iris", email = "code@onyxandiris.online" },
@ -17,9 +17,6 @@ readme = "README.md"
text = "MIT" text = "MIT"
[tool.pdm.dev-dependencies] [tool.pdm.dev-dependencies]
build = [
"pyinstaller>=5.1",
]
lint = [ lint = [
"black>=23.7.0", "black>=23.7.0",
"ruff>=0.0.291", "ruff>=0.0.291",
@ -28,6 +25,9 @@ lint = [
test = [ test = [
"psgdemos>=1.12.1", "psgdemos>=1.12.1",
] ]
build = [
"pyinstaller>=6.3.0",
]
[tool.pdm.scripts.build] [tool.pdm.scripts.build]
shell = "build.ps1" shell = "build.ps1"

8
src/nvda_voicemeeter/cdll.py
View File

@ -5,7 +5,7 @@ from pathlib import Path
from .errors import NVDAVMError from .errors import NVDAVMError
bits = 64 if ct.sizeof(ct.c_void_p) == 8 else 32 BITS = 64 if ct.sizeof(ct.c_void_p) == 8 else 32
if platform.system() != "Windows": if platform.system() != "Windows":
raise NVDAVMError("Only Windows OS supported") raise NVDAVMError("Only Windows OS supported")
@ -15,7 +15,7 @@ REG_KEY = "\\".join(
None, None,
( (
"SOFTWARE", "SOFTWARE",
"WOW6432Node" if bits == 64 else "", "WOW6432Node" if BITS == 64 else "",
"Microsoft", "Microsoft",
"Windows", "Windows",
"CurrentVersion", "CurrentVersion",
@ -39,8 +39,8 @@ except FileNotFoundError:
controller_path = Path(__file__).parents[2].resolve() / "controllerClient" controller_path = Path(__file__).parents[2].resolve() / "controllerClient"
if not controller_path.exists(): if not controller_path.exists():
controller_path = Path("controllerClient") controller_path = Path("_internal") / "controllerClient"
DLL_PATH = controller_path / f"x{64 if bits == 64 else 86}" / f"nvdaControllerClient{bits}.dll" DLL_PATH = controller_path / f"x{64 if BITS == 64 else 86}" / f"nvdaControllerClient{BITS}.dll"
libc = ct.CDLL(str(DLL_PATH)) libc = ct.CDLL(str(DLL_PATH))