diff --git a/pdm.lock b/pdm.lock index 0859f6c..b5e223e 100644 --- a/pdm.lock +++ b/pdm.lock @@ -6,7 +6,7 @@ groups = ["default", "build", "lint", "test"] cross_platform = true static_urls = false lock_version = "4.3" -content_hash = "sha256:2aaf88f0abb701968bc22eb31fd189810850a505bb93553f67216e4d1d259750" +content_hash = "sha256:9051151ac4ac0edefdfaf52faa91dbff89d8bbc942a6ffa61b6ec6fee502aa8a" [[package]] name = "altgraph" @@ -271,13 +271,13 @@ files = [ [[package]] name = "voicemeeter-api" -version = "2.4.8" +version = "2.4.9" requires_python = ">=3.10,<4.0" summary = "A Python wrapper for the Voiceemeter API" dependencies = [ "tomli<3.0.0,>=2.0.1; python_version < \"3.11\"", ] files = [ - {file = "voicemeeter_api-2.4.8-py3-none-any.whl", hash = "sha256:a3ff9e6f7516d2adedde93f6976526b385d8ae6d86598bfe541a44f498f42ea6"}, - {file = "voicemeeter_api-2.4.8.tar.gz", hash = "sha256:0d37a9f2af0f68087aa9c76a8cfb2ba44c6b75bb344e8dfa9fd18ad2c862730c"}, + {file = "voicemeeter_api-2.4.9-py3-none-any.whl", hash = "sha256:a09fd07fe3799cd5c880d491048da81d94e49aa97ec753aa1f9289acd27be965"}, + {file = "voicemeeter_api-2.4.9.tar.gz", hash = "sha256:47ad614a8b9ccb0b4e47acf65666ce0f0537a0890fffda9949e995bea70e679c"}, ] diff --git a/pyproject.toml b/pyproject.toml index 6b2ff26..fcf037c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,18 +1,20 @@ [project] name = "nvda_voicemeeter" -version = "0.1.0" +version = "0.1.1" description = "A Voicemeeter app compatible with NVDA" authors = [ - {name = "onyx-and-iris", email = "code@onyxandiris.online"}, + { name = "onyx-and-iris", email = "code@onyxandiris.online" }, ] dependencies = [ "pysimplegui>=4.60.5", "pyparsing>=3.1.1", - "voicemeeter-api>=2.4.8", + "voicemeeter-api>=2.4.9", ] requires-python = ">=3.10,<3.11" readme = "README.md" -license = {text = "MIT"} + +[project.license] +text = "MIT" [tool.pdm.dev-dependencies] build = [ @@ -26,5 +28,5 @@ test = [ "psgdemos>=1.12.1", ] -[tool.pdm.scripts] -build = {shell = "build.ps1"} \ No newline at end of file +[tool.pdm.scripts.build] +shell = "build.ps1" diff --git a/src/nvda_voicemeeter/models.py b/src/nvda_voicemeeter/models.py index d682da2..a1dcd36 100644 --- a/src/nvda_voicemeeter/models.py +++ b/src/nvda_voicemeeter/models.py @@ -3,7 +3,10 @@ def _make_hardware_ins_cache(vm) -> dict: def _make_hardware_outs_cache(vm) -> dict: - return {**{f"HARDWARE OUT||A{i + 1}": vm.bus[i].device.name for i in range(vm.kind.phys_out)}} + hw_outs = {**{f"HARDWARE OUT||A{i + 1}": vm.bus[i].device.name for i in range(vm.kind.phys_out)}} + if vm.kind.name == "basic": + hw_outs |= {f"HARDWARE OUT||A2": vm.bus[1].device.name} + return hw_outs def _make_param_cache(vm, channel_type) -> dict: diff --git a/src/nvda_voicemeeter/window.py b/src/nvda_voicemeeter/window.py index 8a41127..90f0b96 100644 --- a/src/nvda_voicemeeter/window.py +++ b/src/nvda_voicemeeter/window.py @@ -58,6 +58,8 @@ class NVDAVMWindow(psg.Window): self[f"HARDWARE IN||{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out): self[f"HARDWARE OUT||A{i + 1}"].Widget.config(**buttonmenu_opts) + if self.kind.name == "basic": + self[f"HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts) if self.kind.name != "basic": [self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)] self["ASIO BUFFER"].Widget.config(**buttonmenu_opts) @@ -138,6 +140,10 @@ class NVDAVMWindow(psg.Window): self[f"HARDWARE OUT||A{i + 1}"].bind("", "||FOCUS IN") self[f"HARDWARE OUT||A{i + 1}"].bind("", "||KEY SPACE", propagate=False) self[f"HARDWARE OUT||A{i + 1}"].bind("", "||KEY ENTER", propagate=False) + if self.vm.kind.name == "basic": + self[f"HARDWARE OUT||A2"].bind("", "||FOCUS IN") + self[f"HARDWARE OUT||A2"].bind("", "||KEY SPACE", propagate=False) + self[f"HARDWARE OUT||A2"].bind("", "||KEY ENTER", propagate=False) # Patch ASIO if self.kind.name != "basic":