Skip to content

Commit

Permalink
upd controller_path to reflect changes to pyinstaller
Browse files Browse the repository at this point in the history
patch  bump
  • Loading branch information
onyx-and-iris committed Jan 30, 2024
1 parent b45b2da commit 79f739f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "nvda_voicemeeter"
version = "0.6.2"
version = "0.6.3"
description = "A Voicemeeter app compatible with NVDA"
authors = [
{ name = "onyx-and-iris", email = "[email protected]" },
Expand All @@ -17,9 +17,6 @@ readme = "README.md"
text = "MIT"

[tool.pdm.dev-dependencies]
build = [
"pyinstaller>=5.1",
]
lint = [
"black>=23.7.0",
"ruff>=0.0.291",
Expand All @@ -28,6 +25,9 @@ lint = [
test = [
"psgdemos>=1.12.1",
]
build = [
"pyinstaller>=6.3.0",
]

[tool.pdm.scripts.build]
shell = "build.ps1"
Expand Down
8 changes: 4 additions & 4 deletions src/nvda_voicemeeter/cdll.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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":
raise NVDAVMError("Only Windows OS supported")
Expand All @@ -15,7 +15,7 @@
None,
(
"SOFTWARE",
"WOW6432Node" if bits == 64 else "",
"WOW6432Node" if BITS == 64 else "",
"Microsoft",
"Windows",
"CurrentVersion",
Expand All @@ -39,8 +39,8 @@ def get_nvdapath():

controller_path = Path(__file__).parents[2].resolve() / "controllerClient"
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))

0 comments on commit 79f739f

Please sign in to comment.