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

pyproject.toml

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

src/nvda_voicemeeter/builder.py

@@ -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)
@@ -228,20 +226,24 @@ class Builder:
         return psg.Frame("PATCH INSERT", asio_checkboxes)
 
     def make_tab0_row5(self) -> psg.Frame:
-        """tab0 row5 represents advanced settings"""
+        """tab0 row5 represents asio buffer"""
+
+        samples = get_asio_samples_list()
+        samples.append("Default")
 
         return psg.Frame(
-            "ADVANCED SETTINGS",
+            "ASIO BUFFER",
             [
                 [
-                    psg.Button(
+                    psg.ButtonMenu(
-                        "ADVANCED SETTINGS",
+                        "ASIO BUFFER",
-                        size=(20, 2),
+                        size=(14, 2),
-                        key="ADVANCED SETTINGS",
+                        menu_def=["", samples],
+                        key="ASIO BUFFER",
                     )
+                ]
             ],
-            ],
+            key="ASIO BUFFER FRAME",
-            key="ADVANCED SETTINGS FRAME",
         )
 
     def make_tab1_row(self, i) -> psg.Frame:

src/nvda_voicemeeter/util.py

@@ -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:
+def get_output_device_list(i, vm) -> list:
-    return ["{type}: {name}".format(**vm.device.output(i)) for i in range(vm.device.outs)]
+    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:
@@ -47,20 +51,28 @@ def get_patch_insert_channels() -> list:
 _patch_insert_channels = get_patch_insert_channels()
 
 
-def get_asio_samples_list(driver) -> list:
+def get_asio_samples_list() -> list:
-    if driver == "MME":
+    return [
-        samples = ["2048", "1536", "1024", "896", "768", "704", "640", "576", "512", "480", "441"]
+        "1024",
-    else:
+        "768",
-        # fmt: off
+        "704",
-        samples = [
+        "640",
-            "2048", "1536", "1024", "768", "704", "640", "576", "512", "480", "448", "441", "416", "384",
+        "576",
-            "352", "320", "288", "256", "224", "192", "160", "128"
+        "512",
+        "480",
+        "448",
+        "441",
+        "416",
+        "384",
+        "352",
+        "320",
+        "288",
+        "256",
+        "224",
+        "192",
+        "160",
+        "128",
     ]
-        # fmt: on
-        if driver == "ASIO":
-            samples = [x for x in samples if x not in ("2048", "1536")]
-    samples.append("Default")
-    return samples
 
 
 def get_tabs_labels() -> list:

src/nvda_voicemeeter/window.py

@@ -18,7 +18,6 @@ from .parser import Parser
 from .util import (
     _patch_insert_channels,
     get_asio_checkbox_index,
-    get_asio_samples_list,
     get_bus_modes,
     get_channel_identifier_list,
     get_insert_checkbox_index,
@@ -63,7 +62,10 @@ class NVDAVMWindow(psg.Window):
             self[f"HARDWARE OUT||A2"].Widget.config(**buttonmenu_opts)
         if self.kind.name != "basic":
             [self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)]
-
+            self["ASIO BUFFER"].Widget.config(**buttonmenu_opts)
+        if self.kind.name != "basic":
+            self["ASIO BUFFER FRAME"].update(visible=False)
+            self["ASIO BUFFER FRAME"].hide_row()
         self.register_events()
 
     def __enter__(self):
@@ -126,7 +128,6 @@ class NVDAVMWindow(psg.Window):
         self["tabs"].bind("<FocusIn>", "||FOCUS IN")
         self.bind("<Control-KeyPress-Tab>", "CTRL-TAB")
         self.bind("<Control-Shift-KeyPress-Tab>", "CTRL-SHIFT-TAB")
-        self.bind("<Control-a>", "CTRL-A")
 
         # Hardware In
         for i in range(self.vm.kind.phys_in):
@@ -166,10 +167,6 @@ class NVDAVMWindow(psg.Window):
                 else:
                     [self[f"INSERT CHECKBOX||IN{i + 1} {j}"].bind("<FocusIn>", "||FOCUS IN") for j in range(8)]
 
-        # Advanced Settings
-        if self.kind.name != "basic":
-            self["ADVANCED SETTINGS"].bind("<Return>", "||KEY ENTER")
-
         # Strip Params
         for i in range(self.kind.num_strip):
             for j in range(self.kind.phys_out):
@@ -196,6 +193,12 @@ class NVDAVMWindow(psg.Window):
                 self[f"BUS {i}||{param}"].bind("<FocusIn>", "||FOCUS IN")
                 self[f"BUS {i}||{param}"].bind("<Return>", "||KEY ENTER")
 
+        # ASIO Buffer
+        if self.kind.name != "basic":
+            self["ASIO BUFFER"].bind("<FocusIn>", "||FOCUS IN")
+            self["ASIO BUFFER"].bind("<space>", "||KEY SPACE", propagate=False)
+            self["ASIO BUFFER"].bind("<Return>", "||KEY ENTER", propagate=False)
+
     def popup_save_as(self, message, title=None, initial_folder=None):
         layout = [
             [psg.Text(message)],
@@ -216,15 +219,18 @@ class NVDAVMWindow(psg.Window):
             self.logger.debug(f"values::{values}")
             if event in (psg.WIN_CLOSED, "Cancel"):
                 break
-            match parsed_cmd := self.parser.match.parseString(event):
+            elif event.endswith("||FOCUS IN"):
-                case [[button], ["FOCUS", "IN"]]:
                 if values["Browse"]:
                     filepath = values["Browse"]
                     break
-                    self.nvda.speak(button)
+                label = event.split("||")[0]
-                case [[button], ["KEY", "ENTER"]]:
+                self.TKroot.after(
+                    200 if label == "Edit" else 1,
+                    self.nvda.speak,
+                    label,
+                )
+            elif event.endswith("||KEY ENTER"):
                 window.find_element_with_focus().click()
-            self.logger.debug(f"parsed::{parsed_cmd}")
         window.close()
         if filepath:
             return Path(filepath)
@@ -263,79 +269,24 @@ class NVDAVMWindow(psg.Window):
             self.logger.debug(f"values::{values}")
             if event in (psg.WIN_CLOSED, "Cancel"):
                 break
-            match parsed_cmd := self.parser.match.parseString(event):
+            elif event.endswith("||KEY ENTER"):
-                case ["Index"]:
+                window.find_element_with_focus().click()
+            elif event == "Index":
                 val = values["Index"]
                 self.nvda.speak(f"Index {val}")
-                case [[button], ["FOCUS", "IN"]]:
+            elif event.endswith("||FOCUS IN"):
-                    if button == "Index":
+                if event.startswith("Index"):
                     val = values["Index"]
                     self.nvda.speak(f"Index {val}")
                 else:
-                        self.nvda.speak(button)
+                    self.nvda.speak(event.split("||")[0])
-                case [[button], ["KEY", "ENTER"]]:
+            elif event == "Ok":
-                    window.find_element_with_focus().click()
-                case ["Ok"]:
                 data = values
                 break
-            self.logger.debug(f"parsed::{parsed_cmd}")
+
         window.close()
         return data
 
-    def popup_advanced_settings(self, title):
-        def _make_buffering_frame() -> psg.Frame:
-            buffer = [
-                [
-                    psg.ButtonMenu(
-                        driver,
-                        size=(14, 2),
-                        menu_def=["", get_asio_samples_list(driver)],
-                        key=f"BUFFER {driver}",
-                    )
-                    for driver in ("MME", "WDM", "KS", "ASIO")
-                ],
-            ]
-            return psg.Frame("BUFFERING", buffer)
-
-        buffer_frame = _make_buffering_frame()
-        layout = [[buffer_frame], [psg.Button("Exit")]]
-
-        window = psg.Window(title, layout, finalize=True)
-        buttonmenu_opts = {"takefocus": 1, "highlightthickness": 1}
-        for driver in ("MME", "WDM", "KS", "ASIO"):
-            window[f"BUFFER {driver}"].Widget.config(**buttonmenu_opts)
-            window[f"BUFFER {driver}"].bind("<FocusIn>", "||FOCUS IN")
-            window[f"BUFFER {driver}"].bind("<space>", "||KEY SPACE", propagate=False)
-            window[f"BUFFER {driver}"].bind("<Return>", "||KEY ENTER", propagate=False)
-        window["Exit"].bind("<FocusIn>", "||FOCUS IN")
-        window["Exit"].bind("<Return>", "||KEY ENTER")
-        while True:
-            event, values = window.read()
-            self.logger.debug(f"event::{event}")
-            self.logger.debug(f"values::{values}")
-            if event in (psg.WIN_CLOSED, "Exit"):
-                break
-            match parsed_cmd := self.parser.match.parseString(event):
-                case ["BUFFER MME" | "BUFFER WDM" | "BUFFER KS" | "BUFFER ASIO"]:
-                    if values[event] == "Default":
-                        val = 0
-                    else:
-                        val = int(values[event])
-                    driver = event.split()[1]
-                    self.vm.set(f"option.buffer.{driver.lower()}", val)
-                    self.TKroot.after(200, self.nvda.speak, f"{driver} BUFFER {val if val else 'default'}")
-                case [["BUFFER", driver], ["FOCUS", "IN"]]:
-                    val = int(self.vm.get(f"option.buffer.{driver.lower()}"))
-                    self.nvda.speak(f"{driver} BUFFER {val if val else 'default'}")
-                case [["BUFFER", driver], ["KEY", "SPACE" | "ENTER"]]:
-                    open_context_menu_for_buttonmenu(window, f"BUFFER {driver}")
-                case [[button], ["FOCUS", "IN"]]:
-                    self.nvda.speak(button)
-                case [[button], ["KEY", "ENTER"]]:
-                    window.find_element_with_focus().click()
-            self.logger.debug(f"parsed::{parsed_cmd}")
-        window.close()
-
     def run(self):
         """
         Parses the event string and matches it to events
@@ -544,11 +495,19 @@ class NVDAVMWindow(psg.Window):
                     num = int(in_num[-1])
                     self.nvda.speak(f"Patch INSERT IN#{num} {channel} {'on' if val else 'off'}")
 
-                # Advanced Settings
+                # ASIO Buffer
-                case ["ADVANCED SETTINGS"] | ["CTRL-A"]:
+                case ["ASIO BUFFER"]:
-                    self.popup_advanced_settings(title="Advanced Settings")
+                    if values[event] == "Default":
-                case [["ADVANCED", "SETTINGS"], ["KEY", "ENTER"]]:
+                        val = 0
-                    self.find_element_with_focus().click()
+                    else:
+                        val = values[event]
+                    self.vm.option.buffer("asio", val)
+                    self.TKroot.after(200, self.nvda.speak, f"ASIO BUFFER {val if val else 'default'}")
+                case [["ASIO", "BUFFER"], ["FOCUS", "IN"]]:
+                    val = int(self.vm.get("option.buffer.asio"))
+                    self.nvda.speak(f"ASIO BUFFER {val if val else 'default'}")
+                case [["ASIO", "BUFFER"], ["KEY", "SPACE" | "ENTER"]]:
+                    open_context_menu_for_buttonmenu(self, "ASIO BUFFER")
 
                 # Strip Params
                 case [["STRIP", index], [param]]: