LabelSlider compound element added

labels for sliders added.

all sliders now focusable.

todo: add events/binds for sliders

src/nvda_voicemeeter/builder.py

@@ -1,14 +1,7 @@
 import PySimpleGUI as psg
 
-from .util import (
-    get_asio_checkbox_index,
-    get_input_device_list,
-    get_insert_checkbox_index,
-    get_output_device_list,
-    get_patch_composite_list,
-    get_slider_params,
-    get_tabs_labels,
-)
+from . import util
+from .compound import LabelSlider
 
 
 class Builder:
@@ -92,7 +85,7 @@ class Builder:
             return psg.Tab(identifier, [[tabgroup]], key=f"tab||{identifier}")
 
         tabs = []
-        for tab in get_tabs_labels():
+        for tab in util.get_tabs_labels():
             tabs.append(_make_tabs(tab))
 
         tab_group = psg.TabGroup([tabs], change_submits=True, enable_events=True, key="tabgroup")
@@ -117,7 +110,7 @@ class Builder:
         """tab0 row0 represents hardware ins"""
 
         def add_physical_device_opts(layout):
-            devices = get_input_device_list(self.vm)
+            devices = util.get_input_device_list(self.vm)
             devices.append("- remove device selection -")
             layout.append(
                 [
@@ -148,7 +141,7 @@ class Builder:
                     psg.ButtonMenu(
                         f"A{i + 1}",
                         size=(6, 3),
-                        menu_def=["", get_output_device_list(i, self.vm)],
+                        menu_def=["", util.get_output_device_list(i, self.vm)],
                         key=f"HARDWARE OUT||A{i + 1}",
                     )
                     for i in range(num_outs)
@@ -168,7 +161,7 @@ class Builder:
                 [
                     psg.Spin(
                         nums,
-                        initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{get_asio_checkbox_index(0, i)}"],
+                        initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{util.get_asio_checkbox_index(0, i)}"],
                         size=2,
                         enable_events=True,
                         key=f"ASIO CHECKBOX||IN{i} 0",
@@ -179,7 +172,7 @@ class Builder:
                 [
                     psg.Spin(
                         nums,
-                        initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{get_asio_checkbox_index(1, i)}"],
+                        initial_value=self.window.cache["asio"][f"ASIO CHECKBOX||{util.get_asio_checkbox_index(1, i)}"],
                         size=2,
                         enable_events=True,
                         key=f"ASIO CHECKBOX||IN{i} 1",
@@ -200,7 +193,7 @@ class Builder:
         """tab0 row3 represents patch composite"""
 
         def add_physical_device_opts(layout):
-            outputs = get_patch_composite_list(self.vm.kind)
+            outputs = util.get_patch_composite_list(self.vm.kind)
             layout.append(
                 [
                     psg.ButtonMenu(
@@ -227,7 +220,7 @@ class Builder:
                         [
                             psg.Checkbox(
                                 text=channel,
-                                default=self.vm.patch.insert[get_insert_checkbox_index(self.kind, j, i)].on,
+                                default=self.vm.patch.insert[util.get_insert_checkbox_index(self.kind, j, i)].on,
                                 enable_events=True,
                                 key=f"INSERT CHECKBOX||IN{i} {j}",
                             )
@@ -240,7 +233,7 @@ class Builder:
                     [
                         psg.Checkbox(
                             text=channel,
-                            default=self.vm.patch.insert[get_insert_checkbox_index(self.kind, j, i)].on,
+                            default=self.vm.patch.insert[util.get_insert_checkbox_index(self.kind, j, i)].on,
                             enable_events=True,
                             key=f"INSERT CHECKBOX||IN{i} {j}",
                         )
@@ -315,6 +308,7 @@ class Builder:
         def add_gain_slider(layout):
             layout.append(
                 [
+                    psg.Text("Gain"),
                     psg.Slider(
                         range=(-60, 12),
                         default_value=self.vm.strip[i].gain,
@@ -324,37 +318,17 @@ class Builder:
                         enable_events=True,
                         orientation="horizontal",
                         key=f"STRIP {i}||SLIDER GAIN",
-                    )
+                    ),
                 ]
             )
 
         def add_param_sliders(layout):
-            def default_value(i, param):
-                target = getattr(self.vm.strip[i], param.lower())
-                if param in ("COMP", "GATE", "DENOISER"):
-                    return target.knob
-                return target
-
-            layout.append(
-                [
-                    psg.Slider(
-                        range=(0, 10),
-                        default_value=default_value(i, param),
-                        resolution=0.1,
-                        disable_number_display=True,
-                        size=(12, 10),
-                        expand_x=True,
-                        enable_events=True,
-                        orientation="horizontal",
-                        key=f"STRIP {i}||SLIDER {param}",
-                    )
-                    for param in get_slider_params(i, self.vm)
-                ]
-            )
+            layout.append([LabelSlider(self.window, i, param) for param in util.get_slider_params(i, self.vm)])
 
         def add_limit_slider(layout):
             layout.append(
                 [
+                    psg.Text("Limit"),
                     psg.Slider(
                         range=(-40, 12),
                         default_value=self.vm.strip[i].limit,
@@ -364,7 +338,7 @@ class Builder:
                         enable_events=True,
                         orientation="horizontal",
                         key=f"STRIP {i}||SLIDER LIMIT",
-                    )
+                    ),
                 ]
             )
 
@@ -426,6 +400,7 @@ class Builder:
         def add_gain_slider(layout):
             layout.append(
                 [
+                    psg.Text("Gain"),
                     psg.Slider(
                         range=(-60, 12),
                         default_value=self.vm.strip[i].gain,
@@ -435,34 +410,26 @@ class Builder:
                         enable_events=True,
                         orientation="horizontal",
                         key=f"STRIP {i}||SLIDER GAIN",
-                    )
+                    ),
                 ]
             )
 
         def add_param_sliders(layout):
-            def default_value(i, param):
-                return getattr(self.vm.strip[i], param.lower())
-
-            layout.append(
-                [
-                    psg.Slider(
-                        range=(0, 10),
-                        default_value=default_value(i, param),
-                        resolution=0.1,
-                        disable_number_display=True,
-                        size=(12, 10),
-                        expand_x=True,
-                        enable_events=True,
-                        orientation="horizontal",
-                        key=f"STRIP {i}||SLIDER {param}",
-                    )
-                    for param in get_slider_params(i, self.vm)
-                ]
-            )
+            if self.kind.name in ("basic", "banana"):
+                for param in util.get_slider_params(i, self.vm):
+                    layout.append([LabelSlider(self.window, i, param, range_=(-12, 12))])
+            else:
+                layout.append(
+                    [
+                        LabelSlider(self.window, i, param, range_=(-12, 12))
+                        for param in util.get_slider_params(i, self.vm)
+                    ]
+                )
 
         def add_limit_slider(layout):
             layout.append(
                 [
+                    psg.Text("Limit"),
                     psg.Slider(
                         range=(-40, 12),
                         default_value=self.vm.strip[i].limit,
@@ -472,13 +439,16 @@ class Builder:
                         enable_events=True,
                         orientation="horizontal",
                         key=f"STRIP {i}||SLIDER LIMIT",
-                    )
+                    ),
                 ]
             )
 
-        outputs = []
-        [step(outputs) for step in (add_gain_slider, add_param_sliders, add_limit_slider)]
-        return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], outputs, key=f"STRIP {i}||LABEL||SLIDER")
+        layout = []
+        steps = (add_gain_slider, add_param_sliders)
+        if self.kind.name in ("banana", "potato"):
+            steps += (add_limit_slider,)
+        [step(layout) for step in steps]
+        return psg.Frame(self.window.cache["labels"][f"STRIP {i}||LABEL"], layout, key=f"STRIP {i}||LABEL||SLIDER")
 
     def make_tab2_slider_rows(self) -> psg.Frame:
         layout = [

src/nvda_voicemeeter/compound.py

@@ -0,0 +1,35 @@
+import PySimpleGUI as psg
+
+
+class LabelSlider(psg.Frame):
+    """Compound Label Slider element"""
+
+    def __init__(self, parent, i, param, range_=(0, 10), *args, **kwargs):
+        self.parent = parent
+        if param in ("AUDIBILITY", "DENOISER"):
+            size = 7
+        else:
+            size = 4
+        layout = [
+            [
+                psg.Text(param.capitalize(), size=size),
+                psg.Slider(
+                    range=range_,
+                    default_value=self.default_value(i, param),
+                    resolution=0.1,
+                    disable_number_display=True,
+                    size=(12, 16),
+                    expand_x=True,
+                    enable_events=True,
+                    orientation="horizontal",
+                    key=f"STRIP {i}||SLIDER {param}",
+                ),
+            ]
+        ]
+        super().__init__(None, layout=layout, border_width=0, pad=0, *args, **kwargs)
+
+    def default_value(self, i, param):
+        target = getattr(self.parent.vm.strip[i], param.lower())
+        if param in ("COMP", "GATE", "DENOISER"):
+            return target.knob
+        return target

src/nvda_voicemeeter/util.py

@@ -1,3 +1,6 @@
+from typing import Iterable
+
+
 def get_asio_checkbox_index(channel, num) -> int:
     if channel == 0:
         return 2 * num - 2
@@ -8,8 +11,7 @@ def get_insert_checkbox_index(kind, channel, num) -> int:
     if num <= kind.phys_in:
         if channel == 0:
             return 2 * num - 2
-        else:
-            return 2 * num - 1
+        return 2 * num - 1
     return (2 * kind.phys_in) + (8 * (num - kind.phys_in - 1)) + channel
 
 
@@ -130,7 +132,7 @@ def get_bus_modes(vm) -> list:
     ]
 
 
-def check_bounds(val, bounds) -> int | float:
+def check_bounds(val, bounds: tuple) -> int | float:
     lower, upper = bounds
     if val > upper:
         val = upper
@@ -139,13 +141,12 @@ def check_bounds(val, bounds) -> int | float:
     return val
 
 
-def get_slider_params(i, vm) -> list:
+def get_slider_params(i, vm) -> Iterable:
     if i < vm.kind.phys_in:
         if vm.kind.name == "basic":
             return ("AUDIBILITY",)
-        elif vm.kind.name == "banana":
+        if vm.kind.name == "banana":
             return ("COMP", "GATE")
-        elif vm.kind.name == "potato":
+        if vm.kind.name == "potato":
             return ("COMP", "GATE", "DENOISER")
-    else:
-        return ("BASS", "MID", "TREBLE")
+    return ("BASS", "MID", "TREBLE")

src/nvda_voicemeeter/window.py

@@ -4,29 +4,10 @@ from pathlib import Path
 
 import PySimpleGUI as psg
 
+from . import models, util
 from .builder import Builder
-from .models import (
-    _make_hardware_ins_cache,
-    _make_hardware_outs_cache,
-    _make_label_cache,
-    _make_param_cache,
-    _make_patch_asio_cache,
-    _make_patch_insert_cache,
-)
 from .nvda import Nvda
 from .parser import Parser
-from .util import (
-    _patch_insert_channels,
-    check_bounds,
-    get_asio_checkbox_index,
-    get_asio_samples_list,
-    get_bus_modes,
-    get_channel_identifier_list,
-    get_insert_checkbox_index,
-    get_patch_composite_list,
-    get_tabs_labels,
-    open_context_menu_for_buttonmenu,
-)
 
 logger = logging.getLogger(__name__)
 
@@ -43,13 +24,13 @@ class NVDAVMWindow(psg.Window):
         self.kind = self.vm.kind
         self.logger = logger.getChild(type(self).__name__)
         self.cache = {
-            "hw_ins": _make_hardware_ins_cache(self.vm),
-            "hw_outs": _make_hardware_outs_cache(self.vm),
-            "strip": _make_param_cache(self.vm, "strip"),
-            "bus": _make_param_cache(self.vm, "bus"),
-            "labels": _make_label_cache(self.vm),
-            "asio": _make_patch_asio_cache(self.vm),
-            "insert": _make_patch_insert_cache(self.vm),
+            "hw_ins": models._make_hardware_ins_cache(self.vm),
+            "hw_outs": models._make_hardware_outs_cache(self.vm),
+            "strip": models._make_param_cache(self.vm, "strip"),
+            "bus": models._make_param_cache(self.vm, "bus"),
+            "labels": models._make_label_cache(self.vm),
+            "asio": models._make_patch_asio_cache(self.vm),
+            "insert": models._make_patch_insert_cache(self.vm),
         }
         self.nvda = Nvda()
         self.parser = Parser()
@@ -67,7 +48,15 @@ class NVDAVMWindow(psg.Window):
             [self[f"PATCH COMPOSITE||PC{i + 1}"].Widget.config(**buttonmenu_opts) for i in range(self.kind.phys_out)]
         slider_opts = {"takefocus": 1, "highlightthickness": 1}
         for i in range(self.kind.num_strip):
+            if i < self.kind.phys_in:
+                for param in util.get_slider_params(i, self.vm):
+                    self[f"STRIP {i}||SLIDER {param}"].Widget.config(**slider_opts)
+            else:
+                for param in ("BASS", "MID", "TREBLE"):
+                    self[f"STRIP {i}||SLIDER {param}"].Widget.config(**slider_opts)
             self[f"STRIP {i}||SLIDER GAIN"].Widget.config(**slider_opts)
+            if self.kind.name != "basic":
+                self[f"STRIP {i}||SLIDER LIMIT"].Widget.config(**slider_opts)
         for i in range(self.kind.num_bus):
             self[f"BUS {i}||SLIDER GAIN"].Widget.config(**slider_opts)
 
@@ -107,13 +96,13 @@ class NVDAVMWindow(psg.Window):
 
     def on_pdirty(self):
         self.cache = {
-            "hw_ins": _make_hardware_ins_cache(self.vm),
-            "hw_outs": _make_hardware_outs_cache(self.vm),
-            "strip": _make_param_cache(self.vm, "strip"),
-            "bus": _make_param_cache(self.vm, "bus"),
-            "labels": _make_label_cache(self.vm),
-            "asio": _make_patch_asio_cache(self.vm),
-            "insert": _make_patch_insert_cache(self.vm),
+            "hw_ins": models._make_hardware_ins_cache(self.vm),
+            "hw_outs": models._make_hardware_outs_cache(self.vm),
+            "strip": models._make_param_cache(self.vm, "strip"),
+            "bus": models._make_param_cache(self.vm, "bus"),
+            "labels": models._make_label_cache(self.vm),
+            "asio": models._make_patch_asio_cache(self.vm),
+            "insert": models._make_patch_insert_cache(self.vm),
         }
         for key, value in self.cache["labels"].items():
             self[key].update(value=value)
@@ -125,11 +114,11 @@ class NVDAVMWindow(psg.Window):
         if self.kind.name != "basic":
             for key, value in self.cache["asio"].items():
                 identifier, i = key.split("||")
-                partial = get_channel_identifier_list(self.vm)[int(i)]
+                partial = util.get_channel_identifier_list(self.vm)[int(i)]
                 self[f"{identifier}||{partial}"].update(value=value)
             for key, value in self.cache["insert"].items():
                 identifier, i = key.split("||")
-                partial = get_channel_identifier_list(self.vm)[int(i)]
+                partial = util.get_channel_identifier_list(self.vm)[int(i)]
                 self[f"{identifier}||{partial}"].update(value=value)
 
     def register_events(self):
@@ -137,7 +126,7 @@ class NVDAVMWindow(psg.Window):
 
         # TABS
         self["tabgroup"].bind("<FocusIn>", "||FOCUS IN")
-        for tabname in get_tabs_labels()[1:]:
+        for tabname in util.get_tabs_labels()[1:]:
             self[f"tabgroup||{tabname}"].bind("<FocusIn>", "||FOCUS IN")
             self[f"tabgroup||{tabname}"].bind("<Shift-KeyPress-Tab>", "||KEY SHIFT TAB")
         self.bind("<Control-KeyPress-Tab>", "CTRL-TAB")
@@ -339,7 +328,7 @@ class NVDAVMWindow(psg.Window):
                     psg.ButtonMenu(
                         driver,
                         size=(14, 2),
-                        menu_def=["", get_asio_samples_list(driver)],
+                        menu_def=["", util.get_asio_samples_list(driver)],
                         key=f"BUFFER {driver}",
                     )
                     for driver in ("MME", "WDM", "KS", "ASIO")
@@ -386,7 +375,7 @@ class NVDAVMWindow(psg.Window):
                     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}")
+                    util.open_context_menu_for_buttonmenu(window, f"BUFFER {driver}")
                 case [[button], ["FOCUS", "IN"]]:
                     self.nvda.speak(button)
                 case [[button], ["KEY", "ENTER"]]:
@@ -424,21 +413,21 @@ class NVDAVMWindow(psg.Window):
                         index = int(data["Index"]) - 1
                         match tab:
                             case "Physical Strip":
-                                label = data.get("Edit") or f"Hardware Input {index + 1}"
+                                label = data.get("Edit", f"Hardware Input {index + 1}")
                                 self.vm.strip[index].label = label
                                 self[f"STRIP {index}||LABEL"].update(value=label)
                                 self.cache["labels"][f"STRIP {index}||LABEL"] = label
                             case "Virtual Strip":
                                 index += self.kind.phys_in
-                                label = data.get("Edit") or f"Virtual Input {index - self.kind.phys_in + 1}"
+                                label = data.get("Edit", 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
                             case "Buses":
                                 if index < self.kind.phys_out:
-                                    label = data.get("Edit") or f"Physical Bus {index + 1}"
+                                    label = data.get("Edit", f"Physical Bus {index + 1}")
                                 else:
-                                    label = data.get("Edit") or f"Virtual Bus {index - self.kind.phys_out + 1}"
+                                    label = data.get("Edit", f"Virtual Bus {index - self.kind.phys_out + 1}")
                                 self.vm.bus[index].label = label
                                 self[f"BUS {index}||LABEL"].update(value=label)
                                 self.cache["labels"][f"BUS {index}||LABEL"] = label
@@ -536,7 +525,7 @@ class NVDAVMWindow(psg.Window):
                     if self.find_element_with_focus() is not None:
                         self.nvda.speak(f"HARDWARE INPUT {key} {self.cache['hw_ins'][f'HARDWARE IN||{key}']}")
                 case [["HARDWARE", "IN"], [key], ["KEY", "SPACE" | "ENTER"]]:
-                    open_context_menu_for_buttonmenu(self, f"HARDWARE IN||{key}")
+                    util.open_context_menu_for_buttonmenu(self, f"HARDWARE IN||{key}")
 
                 # Hardware out
                 case [["HARDWARE", "OUT"], [key]]:
@@ -558,11 +547,11 @@ class NVDAVMWindow(psg.Window):
                     if self.find_element_with_focus() is not None:
                         self.nvda.speak(f"HARDWARE OUT {key} {self.cache['hw_outs'][f'HARDWARE OUT||{key}']}")
                 case [["HARDWARE", "OUT"], [key], ["KEY", "SPACE" | "ENTER"]]:
-                    open_context_menu_for_buttonmenu(self, f"HARDWARE OUT||{key}")
+                    util.open_context_menu_for_buttonmenu(self, f"HARDWARE OUT||{key}")
 
                 # Patch ASIO
                 case [["ASIO", "CHECKBOX"], [in_num, channel]]:
-                    index = get_asio_checkbox_index(int(channel), int(in_num[-1]))
+                    index = util.get_asio_checkbox_index(int(channel), int(in_num[-1]))
                     val = values[f"ASIO CHECKBOX||{in_num} {channel}"]
                     self.vm.patch.asio[index].set(val)
                     channel = ("left", "right")[int(channel)]
@@ -578,7 +567,7 @@ class NVDAVMWindow(psg.Window):
                 case [["PATCH", "COMPOSITE"], [key]]:
                     val = values[f"PATCH COMPOSITE||{key}"]
                     index = int(key[-1]) - 1
-                    self.vm.patch.composite[index].set(get_patch_composite_list(self.kind).index(val) + 1)
+                    self.vm.patch.composite[index].set(util.get_patch_composite_list(self.kind).index(val) + 1)
                     self.TKroot.after(200, self.nvda.speak, f"PATCH COMPOSITE {key[-1]} set {val}")
                 case [["PATCH", "COMPOSITE"], [key], ["FOCUS", "IN"]]:
                     if self.find_element_with_focus() is not None:
@@ -586,14 +575,14 @@ class NVDAVMWindow(psg.Window):
                             val = values[f"PATCH COMPOSITE||{key}"]
                         else:
                             index = int(key[-1]) - 1
-                            val = get_patch_composite_list(self.kind)[self.vm.patch.composite[index].get() - 1]
+                            val = util.get_patch_composite_list(self.kind)[self.vm.patch.composite[index].get() - 1]
                         self.nvda.speak(f"Patch COMPOSITE {key[-1]} {val}")
                 case [["PATCH", "COMPOSITE"], [key], ["KEY", "SPACE" | "ENTER"]]:
-                    open_context_menu_for_buttonmenu(self, f"PATCH COMPOSITE||{key}")
+                    util.open_context_menu_for_buttonmenu(self, f"PATCH COMPOSITE||{key}")
 
                 # Patch INSERT
                 case [["INSERT", "CHECKBOX"], [in_num, channel]]:
-                    index = get_insert_checkbox_index(
+                    index = util.get_insert_checkbox_index(
                         self.kind,
                         int(channel),
                         int(in_num[-1]),
@@ -601,17 +590,17 @@ class NVDAVMWindow(psg.Window):
                     val = values[f"INSERT CHECKBOX||{in_num} {channel}"]
                     self.vm.patch.insert[index].on = val
                     self.nvda.speak(
-                        f"PATCH INSERT {in_num} {_patch_insert_channels[int(channel)]} set to {'on' if val else 'off'}"
+                        f"PATCH INSERT {in_num} {util._patch_insert_channels[int(channel)]} set to {'on' if val else 'off'}"
                     )
                 case [["INSERT", "CHECKBOX"], [in_num, channel], ["FOCUS", "IN"]]:
                     if self.find_element_with_focus() is not None:
-                        index = get_insert_checkbox_index(
+                        index = util.get_insert_checkbox_index(
                             self.kind,
                             int(channel),
                             int(in_num[-1]),
                         )
                         val = values[f"INSERT CHECKBOX||{in_num} {channel}"]
-                        channel = _patch_insert_channels[int(channel)]
+                        channel = util._patch_insert_channels[int(channel)]
                         num = int(in_num[-1])
                         self.nvda.speak(f"Patch INSERT IN#{num} {channel} {'on' if val else 'off'}")
 
@@ -700,7 +689,7 @@ class NVDAVMWindow(psg.Window):
                             val += 1
                         case "LEFT" | "DOWN":
                             val -= 1
-                    self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
                 case [
                     ["STRIP", index],
@@ -713,7 +702,7 @@ class NVDAVMWindow(psg.Window):
                             val += 3
                         case "LEFT" | "DOWN":
                             val -= 3
-                    self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
                 case [
                     ["STRIP", index],
@@ -726,7 +715,7 @@ class NVDAVMWindow(psg.Window):
                             val += 0.1
                         case "LEFT" | "DOWN":
                             val -= 0.1
-                    self.vm.strip[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"STRIP {index}||SLIDER GAIN"].update(value=val)
 
                 # Bus Params
@@ -753,7 +742,7 @@ class NVDAVMWindow(psg.Window):
                                 f"{label} bus {param} {'on' if val else 'off'}",
                             )
                         case "MODE":
-                            bus_modes = get_bus_modes(self.vm)
+                            bus_modes = util.get_bus_modes(self.vm)
                             next_index = bus_modes.index(val) + 1
                             if next_index == len(bus_modes):
                                 next_index = 0
@@ -809,7 +798,7 @@ class NVDAVMWindow(psg.Window):
                             val += 1
                         case "LEFT" | "DOWN":
                             val -= 1
-                    self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.bus[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"BUS {index}||SLIDER GAIN"].update(value=val)
                 case [
                     ["BUS", index],
@@ -822,7 +811,7 @@ class NVDAVMWindow(psg.Window):
                             val += 3
                         case "LEFT" | "DOWN":
                             val -= 3
-                    self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.bus[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"BUS {index}||SLIDER GAIN"].update(value=val)
                 case [
                     ["BUS", index],
@@ -835,7 +824,7 @@ class NVDAVMWindow(psg.Window):
                             val += 0.1
                         case "LEFT" | "DOWN":
                             val -= 0.1
-                    self.vm.bus[int(index)].gain = check_bounds(val, (-60, 12))
+                    self.vm.bus[int(index)].gain = util.check_bounds(val, (-60, 12))
                     self[f"BUS {index}||SLIDER GAIN"].update(value=val)
 
                 # Unknown