mirror of
https://github.com/onyx-and-iris/nvda-voicemeeter.git
synced 2024-11-22 10:00:46 +00:00
fixes bug setting devices with trailing spaces
adds rejected_ids to util. removes Voicemeeter devices as assignable hardware devices patch bump
This commit is contained in:
parent
7648b68b85
commit
aaa2c72668
@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "nvda_voicemeeter"
|
||||
version = "0.1.4"
|
||||
version = "0.1.5"
|
||||
description = "A Voicemeeter app compatible with NVDA"
|
||||
authors = [
|
||||
{ name = "onyx-and-iris", email = "code@onyxandiris.online" },
|
||||
|
@ -13,12 +13,28 @@ 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(i, vm) -> list:
|
||||
devices = ["{type}: {name}".format(**vm.device.output(j)) for j in range(vm.device.outs)]
|
||||
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 -")
|
||||
|
@ -431,7 +431,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,
|
||||
|
Loading…
Reference in New Issue
Block a user