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

fixes bug setting devices with trailing spaces

Browse Source 
adds rejected_ids to util.
removes Voicemeeter devices as assignable
hardware devices

patch bump
This commit is contained in:
onyx-and-iris 2023-09-13 10:56:09 +01:00
parent 7648b68b85
commit aaa2c72668
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[project] [project]
name = "nvda_voicemeeter" name = "nvda_voicemeeter"
version = "0.1.4" version = "0.1.5"
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" },

20
src/nvda_voicemeeter/util.py
View File

@ -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 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: 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: 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: if i == 0:
return devices return devices
devices.append("- remove device selection -") devices.append("- remove device selection -")

2
src/nvda_voicemeeter/window.py
View File

@ -431,7 +431,7 @@ class NVDAVMWindow(psg.Window):
setattr(self.vm.bus[index].device, "wdm", "") setattr(self.vm.bus[index].device, "wdm", "")
self.TKroot.after(200, self.nvda.speak, f"HARDWARE OUT {key} device selection removed") self.TKroot.after(200, self.nvda.speak, f"HARDWARE OUT {key} device selection removed")
case [driver, device_name]: 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"} phonetic = {"mme": "em em e"}
self.TKroot.after( self.TKroot.after(
200, 200,