pyproject.toml

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

src/nvda_voicemeeter/builder.py

@@ -102,6 +102,8 @@ 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:
@@ -111,7 +113,7 @@ class Builder:
                     psg.ButtonMenu(
                         f"A{i + 1}",
                         size=(6, 3),
-                        menu_def=["", get_output_device_list(i, self.vm)],
+                        menu_def=["", devices],
                         key=f"HARDWARE OUT||A{i + 1}",
                     )
                     for i in range(num_outs)

src/nvda_voicemeeter/util.py

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

src/nvda_voicemeeter/window.py

@@ -168,7 +168,6 @@ class NVDAVMWindow(psg.Window):
 
         # Advanced Settings
         if self.kind.name != "basic":
-            self["ADVANCED SETTINGS"].bind("<FocusIn>", "||FOCUS IN")
             self["ADVANCED SETTINGS"].bind("<Return>", "||KEY ENTER")
 
         # Strip Params
@@ -298,11 +297,8 @@ class NVDAVMWindow(psg.Window):
             ]
             return psg.Frame("BUFFERING", buffer)
 
-        layout = []
+        buffer_frame = _make_buffering_frame()
-        steps = (_make_buffering_frame,)
+        layout = [[buffer_frame], [psg.Button("Exit")]]
-        for step in steps:
-            layout.append([step()])
-        layout.append([psg.Button("Exit", size=(8, 2))])
 
         window = psg.Window(title, layout, finalize=True)
         buttonmenu_opts = {"takefocus": 1, "highlightthickness": 1}
@@ -322,11 +318,6 @@ class NVDAVMWindow(psg.Window):
             match parsed_cmd := self.parser.match.parseString(event):
                 case ["BUFFER MME" | "BUFFER WDM" | "BUFFER KS" | "BUFFER ASIO"]:
                     if values[event] == "Default":
-                        if "MME" in event:
-                            val = 1024
-                        elif "WDM" in event or "KS" in event:
-                            val = 512
-                        else:
                         val = 0
                     else:
                         val = int(values[event])
@@ -468,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.lstrip())
+                            setattr(self.vm.strip[index].device, driver, device_name.strip())
                             phonetic = {"mme": "em em e"}
                             self.TKroot.after(
                                 200,
@@ -489,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.lstrip())
+                            setattr(self.vm.bus[index].device, driver, device_name.strip())
                             phonetic = {"mme": "em em e"}
                             self.TKroot.after(
                                 200,
@@ -555,10 +546,7 @@ class NVDAVMWindow(psg.Window):
 
                 # Advanced Settings
                 case ["ADVANCED SETTINGS"] | ["CTRL-A"]:
-                    if values["tabs"] == "Settings":
                     self.popup_advanced_settings(title="Advanced Settings")
-                case [["ADVANCED", "SETTINGS"], ["FOCUS", "IN"]]:
-                    self.nvda.speak("ADVANCED SETTINGS")
                 case [["ADVANCED", "SETTINGS"], ["KEY", "ENTER"]]:
                     self.find_element_with_focus().click()