Compare commits

...

4 Commits

Author SHA1 Message Date
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
5069db97da ensure Virtual Input gets correct label if cleared 2023-09-10 14:32:31 +01:00
681bf8e85c fixes bug renaming virtual strips.
patch bump
2023-09-10 14:23:34 +01:00
8424558f3d special thanks section added to readme 2023-09-07 07:29:04 +01:00
5 changed files with 23 additions and 10 deletions

View File

@@ -42,7 +42,7 @@ with voicemeeterlib.api(KIND_ID, sync=True) as vm:
window.run()
```
### `KIND_ID`
### KIND_ID
May be one of the following:
@@ -84,6 +84,16 @@ The `Save Settings` option opens a popup window with two buttons, `Browse` and `
If you have any questions/suggestions feel free to raise an issue or open a new discussion.
### Special Thanks
[Mario Loreti](https://www.marioloreti.net/en/) for his help in testing and offering feedback during development.
[NVAccess](https://www.nvaccess.org/) for creating the open source NVDA screen reader and its controller client.
[Vincent Burel](https://github.com/vburel2018) for creating Voicemeeter and its SDK.
[PySimpleGUI](https://github.com/PySimpleGUI) team for creating an awesome GUI framework.
[voicemeeter]: https://voicemeeter.com/
[nvda]: https://www.nvaccess.org/
[controller_client]: https://github.com/nvaccess/nvda/tree/master/extras/controllerClient

View File

@@ -1,6 +1,6 @@
[project]
name = "nvda_voicemeeter"
version = "0.1.2"
version = "0.1.4"
description = "A Voicemeeter app compatible with NVDA"
authors = [
{ name = "onyx-and-iris", email = "code@onyxandiris.online" },

View File

@@ -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)

View File

@@ -17,8 +17,12 @@ def get_input_device_list(vm) -> list:
return ["{type}: {name}".format(**vm.device.input(i)) for i in range(vm.device.ins)]
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 = ["{type}: {name}".format(**vm.device.output(j)) for j in range(vm.device.outs)]
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:

View File

@@ -237,9 +237,9 @@ class NVDAVMWindow(psg.Window):
def popup_rename(self, message, title=None, tab=None):
if tab == "Physical Strip":
upper = self.kind.phys_out + 1
upper = self.kind.phys_in + 1
elif tab == "Virtual Strip":
upper = self.kind.virt_out + 1
upper = self.kind.virt_in + 1
elif tab == "Buses":
upper = self.kind.num_bus + 1
@@ -323,7 +323,8 @@ class NVDAVMWindow(psg.Window):
self[f"STRIP {index}||LABEL"].update(value=label)
self.cache["labels"][f"STRIP {index}||LABEL"] = label
case "Virtual Strip":
label = data.get("Edit") or f"Virtual Input {index + 1}"
index += self.kind.phys_in
label = data.get("Edit") or f"Virtual Input {index - self.kind.phys_in + 1}"
self.vm.strip[index].label = label
self[f"STRIP {index}||LABEL"].update(value=label)
self.cache["labels"][f"STRIP {index}||LABEL"] = label