adds advanced settings for Basic kind.

update default values for each driver type
open advanced settings popup if current tab is settings. minor version bump
2025-04-11 08:03:47 +01:00 · 2023-09-13 14:12:48 +01:00 · 2023-09-13 12:16:28 +01:00 · 2023-09-13 11:30:00 +01:00 · 2023-09-13 10:59:41 +01:00 · 2023-09-13 10:56:09 +01:00
4 changed files with 144 additions and 87 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -1,6 +1,6 @@
 [project]
 name = "nvda_voicemeeter"
-version = "0.1.4"
+version = "0.2.1"
 description = "A Voicemeeter app compatible with NVDA"
 authors = [
    { name = "onyx-and-iris", email = "code@onyxandiris.online" },
--- a/src/nvda_voicemeeter/builder.py
+++ b/src/nvda_voicemeeter/builder.py
@ -27,6 +27,7 @@ class Builder:
            steps = (
                self.make_tab0_row0,
                self.make_tab0_row1,
+                self.make_tab0_row5,
            )
        else:
            steps = (
@ -226,24 +227,20 @@ class Builder:
        return psg.Frame("PATCH INSERT", asio_checkboxes)

    def make_tab0_row5(self) -> psg.Frame:
-        """tab0 row5 represents asio buffer"""
-
-        samples = get_asio_samples_list()
-        samples.append("Default")
+        """tab0 row5 represents advanced settings"""

        return psg.Frame(
-            "ASIO BUFFER",
+            "ADVANCED SETTINGS",
            [
                [
-                    psg.ButtonMenu(
-                        "ASIO BUFFER",
-                        size=(14, 2),
-                        menu_def=["", samples],
-                        key="ASIO BUFFER",
+                    psg.Button(
+                        "ADVANCED SETTINGS",
+                        size=(20, 2),
+                        key="ADVANCED SETTINGS",
                    )
-                ]
+                ],
            ],
-            key="ASIO BUFFER FRAME",
+            key="ADVANCED SETTINGS FRAME",
        )

    def make_tab1_row(self, i) -> psg.Frame:
--- a/src/nvda_voicemeeter/util.py
+++ b/src/nvda_voicemeeter/util.py
@ -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


+_rejected_ids = (
+    "VBAudio100VMVAIO3",
+    "{F5735BD4-6EAF-4758-9710-9886E5AD0FF3}",
+    "{0239BE07-CEEF-4236-A900-AA778D432FD4}",
+)
+
+
 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:
-    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:
        return devices
    devices.append("- remove device selection -")
@ -51,28 +67,20 @@ def get_patch_insert_channels() -> list:
 _patch_insert_channels = get_patch_insert_channels()


-def get_asio_samples_list() -> list:
-    return [
-        "1024",
-        "768",
-        "704",
-        "640",
-        "576",
-        "512",
-        "480",
-        "448",
-        "441",
-        "416",
-        "384",
-        "352",
-        "320",
-        "288",
-        "256",
-        "224",
-        "192",
-        "160",
-        "128",
-    ]
+def get_asio_samples_list(driver) -> list:
+    if driver == "MME":
+        samples = ["2048", "1536", "1024", "896", "768", "704", "640", "576", "512", "480", "441"]
+    else:
+        # fmt: off
+        samples = [
+            "2048", "1536", "1024", "768", "704", "640", "576", "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:
--- a/src/nvda_voicemeeter/window.py
+++ b/src/nvda_voicemeeter/window.py
@ -18,6 +18,7 @@ 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,
@ -62,10 +63,7 @@ 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):
@ -128,6 +126,7 @@ 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):
@ -167,6 +166,10 @@ class NVDAVMWindow(psg.Window):
                else:
                    [self[f"INSERT CHECKBOX||IN{i + 1} {j}"].bind("<FocusIn>", "||FOCUS IN") for j in range(8)]

+        # Advanced Settings
+        self["ADVANCED SETTINGS"].bind("<FocusIn>", "||FOCUS IN")
+        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):
@ -193,12 +196,6 @@ 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)],
@ -219,18 +216,15 @@ class NVDAVMWindow(psg.Window):
            self.logger.debug(f"values::{values}")
            if event in (psg.WIN_CLOSED, "Cancel"):
                break
-            elif event.endswith("||FOCUS IN"):
-                if values["Browse"]:
-                    filepath = values["Browse"]
-                    break
-                label = event.split("||")[0]
-                self.TKroot.after(
-                    200 if label == "Edit" else 1,
-                    self.nvda.speak,
-                    label,
-                )
-            elif event.endswith("||KEY ENTER"):
-                window.find_element_with_focus().click()
+            match parsed_cmd := self.parser.match.parseString(event):
+                case [[button], ["FOCUS", "IN"]]:
+                    if values["Browse"]:
+                        filepath = values["Browse"]
+                        break
+                    self.nvda.speak(button)
+                case [[button], ["KEY", "ENTER"]]:
+                    window.find_element_with_focus().click()
+            self.logger.debug(f"parsed::{parsed_cmd}")
        window.close()
        if filepath:
            return Path(filepath)
@ -269,24 +263,87 @@ class NVDAVMWindow(psg.Window):
            self.logger.debug(f"values::{values}")
            if event in (psg.WIN_CLOSED, "Cancel"):
                break
-            elif event.endswith("||KEY ENTER"):
-                window.find_element_with_focus().click()
-            elif event == "Index":
-                val = values["Index"]
-                self.nvda.speak(f"Index {val}")
-            elif event.endswith("||FOCUS IN"):
-                if event.startswith("Index"):
+            match parsed_cmd := self.parser.match.parseString(event):
+                case ["Index"]:
                    val = values["Index"]
                    self.nvda.speak(f"Index {val}")
-                else:
-                    self.nvda.speak(event.split("||")[0])
-            elif event == "Ok":
-                data = values
-                break
-
+                case [[button], ["FOCUS", "IN"]]:
+                    if button == "Index":
+                        val = values["Index"]
+                        self.nvda.speak(f"Index {val}")
+                    else:
+                        self.nvda.speak(button)
+                case [[button], ["KEY", "ENTER"]]:
+                    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)
+
+        layout = []
+        steps = (_make_buffering_frame,)
+        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}
+        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":
+                        if "MME" in event:
+                            val = 1024
+                        elif "WDM" in event or "KS" in event:
+                            val = 512
+                        else:
+                            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
@ -410,7 +467,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.strip())
+                            setattr(self.vm.strip[index].device, driver, device_name.lstrip())
                            phonetic = {"mme": "em em e"}
                            self.TKroot.after(
                                200,
@ -431,7 +488,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.strip())
+                            setattr(self.vm.bus[index].device, driver, device_name.lstrip())
                            phonetic = {"mme": "em em e"}
                            self.TKroot.after(
                                200,
@ -495,19 +552,14 @@ class NVDAVMWindow(psg.Window):
                    num = int(in_num[-1])
                    self.nvda.speak(f"Patch INSERT IN#{num} {channel} {'on' if val else 'off'}")

-                # ASIO Buffer
-                case ["ASIO BUFFER"]:
-                    if values[event] == "Default":
-                        val = 0
-                    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")
+                # 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()

                # Strip Params
                case [["STRIP", index], [param]]:
Author	SHA1	Message	Date
onyx-and-iris	7ab7c30e80	adds advanced settings for Basic kind.	2023-09-13 14:12:48 +01:00
onyx-and-iris	bfdc0306e3	update default values for each driver type open advanced settings popup if current tab is settings. minor version bump	2023-09-13 12:16:28 +01:00
onyx-and-iris	245476adfd	Merge remote-tracking branch 'origin/dev' into add-advanced-settings	2023-09-13 11:30:00 +01:00
onyx-and-iris	2562c02b7e	lstrip hardware in as well.	2023-09-13 10:59:41 +01:00
onyx-and-iris	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
onyx-and-iris	14c6b937d1	implements advanced settings popup gives access to driver buffer settings. may open by button or ctrl-a	2023-09-11 07:51:16 +01:00