Compare commits

..

3 Commits

Author SHA1 Message Date
2562c02b7e lstrip hardware in as well. 2023-09-13 10:59:41 +01:00
aaa2c72668 fixes bug setting devices with trailing spaces
adds rejected_ids to util.
removes Voicemeeter devices as assignable
hardware devices

patch bump
2023-09-13 10:56:09 +01:00
7648b68b85 remove asio devices from hardware out context menus
if not A1

removes `-remove device selection-` from hardware out A1 context menu

patch bump

fixes #7
2023-09-11 12:36:40 +01:00
4 changed files with 27 additions and 9 deletions

View File

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

View File

@@ -102,8 +102,6 @@ class Builder:
"""tab0 row1 represents hardware outs""" """tab0 row1 represents hardware outs"""
def add_physical_device_opts(layout): def add_physical_device_opts(layout):
devices = get_output_device_list(self.vm)
devices.append("- remove device selection -")
if self.kind.name == "basic": if self.kind.name == "basic":
num_outs = self.kind.phys_out + self.kind.virt_out num_outs = self.kind.phys_out + self.kind.virt_out
else: else:
@@ -113,7 +111,7 @@ class Builder:
psg.ButtonMenu( psg.ButtonMenu(
f"A{i + 1}", f"A{i + 1}",
size=(6, 3), size=(6, 3),
menu_def=["", devices], menu_def=["", get_output_device_list(i, self.vm)],
key=f"HARDWARE OUT||A{i + 1}", key=f"HARDWARE OUT||A{i + 1}",
) )
for i in range(num_outs) for i in range(num_outs)

View File

@@ -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 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(vm) -> list: def get_output_device_list(i, vm) -> list:
return ["{type}: {name}".format(**vm.device.output(i)) for i 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 -")
return [device for device in devices if not device.startswith("asio")]
def get_patch_composite_list(kind) -> list: def get_patch_composite_list(kind) -> list:

View File

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