diff --git a/pyproject.toml b/pyproject.toml index de469d4..931c0b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "nvda_voicemeeter" -version = "0.1.3" +version = "0.1.5" description = "A Voicemeeter app compatible with NVDA" authors = [ { name = "onyx-and-iris", email = "code@onyxandiris.online" }, diff --git a/src/nvda_voicemeeter/builder.py b/src/nvda_voicemeeter/builder.py index fcc0c13..1968c49 100644 --- a/src/nvda_voicemeeter/builder.py +++ b/src/nvda_voicemeeter/builder.py @@ -102,8 +102,6 @@ class Builder: """tab0 row1 represents hardware outs""" def add_physical_device_opts(layout): - devices = get_output_device_list(self.vm) - devices.append("- remove device selection -") if self.kind.name == "basic": num_outs = self.kind.phys_out + self.kind.virt_out else: @@ -113,7 +111,7 @@ class Builder: psg.ButtonMenu( f"A{i + 1}", size=(6, 3), - menu_def=["", devices], + menu_def=["", get_output_device_list(i, self.vm)], key=f"HARDWARE OUT||A{i + 1}", ) for i in range(num_outs) diff --git a/src/nvda_voicemeeter/util.py b/src/nvda_voicemeeter/util.py index 96e8485..82c7ee8 100644 --- a/src/nvda_voicemeeter/util.py +++ b/src/nvda_voicemeeter/util.py @@ -13,12 +13,32 @@ def get_insert_checkbox_index(kind, channel, num) -> int: return (2 * kind.phys_in) + (8 * (num - kind.phys_in - 1)) + channel +_rejected_ids = ( + "VBAudio100VMVAIO3", + "{F5735BD4-6EAF-4758-9710-9886E5AD0FF3}", + "{0239BE07-CEEF-4236-A900-AA778D432FD4}", +) + + def get_input_device_list(vm) -> list: - return ["{type}: {name}".format(**vm.device.input(i)) for i in range(vm.device.ins)] + devices = [] + for j in range(vm.device.ins): + device = vm.device.input(j) + if device["id"] not in _rejected_ids: + devices.append("{type}: {name}".format(**device)) + return devices -def get_output_device_list(vm) -> list: - return ["{type}: {name}".format(**vm.device.output(i)) for i in range(vm.device.outs)] +def get_output_device_list(i, vm) -> list: + devices = [] + for j in range(vm.device.outs): + device = vm.device.output(j) + if device["id"] not in _rejected_ids: + devices.append("{type}: {name}".format(**device)) + if i == 0: + return devices + devices.append("- remove device selection -") + return [device for device in devices if not device.startswith("asio")] def get_patch_composite_list(kind) -> list: diff --git a/src/nvda_voicemeeter/window.py b/src/nvda_voicemeeter/window.py index 7c2b050..bbdeceb 100644 --- a/src/nvda_voicemeeter/window.py +++ b/src/nvda_voicemeeter/window.py @@ -459,7 +459,7 @@ class NVDAVMWindow(psg.Window): setattr(self.vm.strip[index].device, "wdm", "") self.TKroot.after(200, self.nvda.speak, f"HARDWARE IN {key} device selection removed") case [driver, device_name]: - setattr(self.vm.strip[index].device, driver, device_name.strip()) + setattr(self.vm.strip[index].device, driver, device_name.lstrip()) phonetic = {"mme": "em em e"} self.TKroot.after( 200, @@ -480,7 +480,7 @@ class NVDAVMWindow(psg.Window): setattr(self.vm.bus[index].device, "wdm", "") self.TKroot.after(200, self.nvda.speak, f"HARDWARE OUT {key} device selection removed") case [driver, device_name]: - setattr(self.vm.bus[index].device, driver, device_name.strip()) + setattr(self.vm.bus[index].device, driver, device_name.lstrip()) phonetic = {"mme": "em em e"} self.TKroot.after( 200,