add feedback for comp/gate sliders.

bus mode button now reads current mode from tkVar (more reliable).

bus mono button fixed (possible to set stereo reverse)
This commit is contained in:
onyx-and-iris 2026-03-08 21:13:30 +00:00
parent edc76db88e
commit 81a5497a32
7 changed files with 122 additions and 73 deletions

8
poetry.lock generated
View File

@ -1,4 +1,4 @@
# This file is automatically @generated by Poetry 2.3.1 and should not be changed by hand. # This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand.
[[package]] [[package]]
name = "altgraph" name = "altgraph"
@ -223,7 +223,7 @@ files = [
[[package]] [[package]]
name = "vban-cmd" name = "vban-cmd"
version = "2.5.2" version = "2.10.1"
description = "Python interface for the VBAN RT Packet Service (Sendtext)" description = "Python interface for the VBAN RT Packet Service (Sendtext)"
optional = false optional = false
python-versions = ">=3.10" python-versions = ">=3.10"
@ -240,7 +240,7 @@ url = "../vban-cmd-python"
[[package]] [[package]]
name = "voicemeeter-api" name = "voicemeeter-api"
version = "2.7.1" version = "2.7.2"
description = "A Python wrapper for the Voiceemeter API" description = "A Python wrapper for the Voiceemeter API"
optional = false optional = false
python-versions = ">=3.10" python-versions = ">=3.10"
@ -258,4 +258,4 @@ url = "../voicemeeter-api-python"
[metadata] [metadata]
lock-version = "2.1" lock-version = "2.1"
python-versions = ">=3.10,<3.14" python-versions = ">=3.10,<3.14"
content-hash = "d457ab1aaa0beaad130dc9a2a04e5e1f8c1b29ed1d0e7d43183e2648fd9ed47c" content-hash = "171da15ce55f47b4e651aade40ab21afd5ef589ff7ff26e51caf6840d25b98a1"

View File

@ -7,8 +7,8 @@ license = { text = "MIT" }
readme = "README.md" readme = "README.md"
requires-python = ">=3.10,<3.14" requires-python = ">=3.10,<3.14"
dependencies = [ dependencies = [
"voicemeeter-api (>=2.6.1,<3.0.0)", "voicemeeter-api (>=2.7.2,<3.0.0)",
"vban-cmd (>=2.5.0,<3.0.0)", "vban-cmd (>=2.10.1,<3.0.0)",
"sv-ttk (>=2.6.0,<3.0.0)", "sv-ttk (>=2.6.0,<3.0.0)",
"tomli (>=2.0.1,<3.0) ; python_version < '3.11'", "tomli (>=2.0.1,<3.0) ; python_version < '3.11'",
] ]

View File

@ -227,7 +227,7 @@ class ChannelLabelFrameBuilder(AbstractBuilder):
"""Adds a progress bar widget to a single label frame""" """Adds a progress bar widget to a single label frame"""
self.labelframe.pb = ttk.Progressbar( self.labelframe.pb = ttk.Progressbar(
self.labelframe, self.labelframe,
maximum=72, maximum=72, # Range: 0 = -60dB, 72 = +12dB (72dB total range)
orient='vertical', orient='vertical',
mode='determinate', mode='determinate',
variable=self.labelframe.level, variable=self.labelframe.level,
@ -362,15 +362,15 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
tk.BooleanVar() for _ in self.configframe.virt_out_params tk.BooleanVar() for _ in self.configframe.virt_out_params
] ]
self.configframe.params = ('mono', 'solo') self.configframe.bool_params = ('mono', 'solo')
self.configframe.param_vars = list( self.configframe.bool_param_vars = list(
tk.BooleanVar() for _ in self.configframe.params tk.BooleanVar() for _ in self.configframe.bool_params
) )
if self.configframe.parent.kind.name in ('banana', 'potato'): if self.configframe.parent.kind.name in ('banana', 'potato'):
if self.configframe.index == self.configframe.phys_in: if self.configframe.index == self.configframe.phys_in:
self.configframe.params = list( self.configframe.params = list(
map(lambda x: x.replace('mono', 'mc'), self.configframe.params) map(lambda x: x.replace('mono', 'mc'), self.configframe.bool_params)
) )
if self.configframe.parent.kind.name == 'banana': if self.configframe.parent.kind.name == 'banana':
pass pass
@ -388,7 +388,10 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
== self.configframe.phys_in + self.configframe.virt_in - 1 == self.configframe.phys_in + self.configframe.virt_in - 1
): ):
self.configframe.params = list( self.configframe.params = list(
map(lambda x: x.replace('mono', 'mc'), self.configframe.params) map(
lambda x: x.replace('mono', 'mc'),
self.configframe.bool_params,
)
) )
def create_comp_slider(self): def create_comp_slider(self):
@ -542,9 +545,9 @@ class StripConfigFrameBuilder(ChannelConfigFrameBuilder):
self.configframe.pause_updates, self.configframe.toggle_p, param self.configframe.pause_updates, self.configframe.toggle_p, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}',
variable=self.configframe.param_vars[i], variable=self.configframe.bool_param_vars[i],
) )
for i, param in enumerate(self.configframe.params) for i, param in enumerate(self.configframe.bool_params)
] ]
[ [
button.grid( button.grid(
@ -574,10 +577,22 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
"lfeonly": "LFE Only", "lfeonly": "LFE Only",
"rearonly": "Rear Only", "rearonly": "Rear Only",
} }
self.configframe.bus_mode_map_reverse = {v: k for k, v in self.configframe.bus_mode_map.items()}
self.configframe.bus_modes = list(self.configframe.bus_mode_map.keys()) self.configframe.bus_modes = list(self.configframe.bus_mode_map.keys())
# fmt: on # fmt: on
self.configframe.params = ('mono', 'eq.on', 'eq.ab') self.configframe.int_params = ('mono',)
self.configframe.param_vars = [tk.BooleanVar() for _ in self.configframe.params] self.configframe.int_param_vars = [
tk.IntVar(value=getattr(self.configframe.target, param))
for param in self.configframe.int_params
]
self.configframe.mono_modes = ['mono: off', 'mono: on', 'stereo reverse']
self.configframe.bus_mono_label_text = tk.StringVar(
value=self.configframe.mono_modes[self.configframe.target.mono]
)
self.configframe.bool_params = ('eq.on', 'eq.ab')
self.configframe.bool_param_vars = [
tk.BooleanVar() for _ in self.configframe.bool_params
]
self.configframe.bus_mode_label_text = tk.StringVar( self.configframe.bus_mode_label_text = tk.StringVar(
value=self.configframe.bus_mode_map[self.configframe.current_bus_mode()] value=self.configframe.bus_mode_map[self.configframe.current_bus_mode()]
) )
@ -602,6 +617,20 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
), ),
) )
def create_bus_mono_button(self):
self.configframe.mono_button = ttk.Button(
self.configframe, textvariable=self.configframe.bus_mono_label_text
)
self.configframe.mono_button.bind(
'<Button-1>',
partial(self.configframe.pause_updates, self.configframe.rotate_mono_right),
)
self.configframe.mono_button.bind(
'<Button-3>',
partial(self.configframe.pause_updates, self.configframe.rotate_mono_left),
)
self.configframe.mono_button.grid(column=0, row=1, sticky=(tk.W))
def create_param_buttons(self): def create_param_buttons(self):
param_buttons = [ param_buttons = [
ttk.Checkbutton( ttk.Checkbutton(
@ -611,13 +640,13 @@ class BusConfigFrameBuilder(ChannelConfigFrameBuilder):
self.configframe.pause_updates, self.configframe.toggle_p, param self.configframe.pause_updates, self.configframe.toggle_p, param
), ),
style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}', style=f'{"Toggle.TButton" if _configuration.themes_enabled else f"{param}.TButton"}',
variable=self.configframe.param_vars[i], variable=self.configframe.bool_param_vars[i],
) )
for i, param in enumerate(self.configframe.params) for i, param in enumerate(self.configframe.bool_params)
] ]
[ [
button.grid( button.grid(
column=i, column=i + 1,
row=1, row=1,
) )
for i, button in enumerate(param_buttons) for i, button in enumerate(param_buttons)

View File

@ -197,14 +197,22 @@ class Strip(ChannelLabelFrame):
def upd_levels(self): def upd_levels(self):
""" """
Updates level values. Updates level values using direct dB values.
""" """
if self.index < self.parent.parent.kind.num_strip: if self.index < self.parent.parent.kind.num_strip:
if self.target.levels.is_updated: if self.target.levels.is_updated:
val = max(self.target.levels.prefader) val = max(self.target.levels.prefader)
self.level.set( if val < -72:
(0 if self.mute.get() else 72 + val - 12 + self.gain.get()) if self.level.get() != 0:
) self.level.set(0)
return
# Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
if self.mute.get():
level_display = 0
else:
level_db = val + self.gain.get()
level_display = max(0, min(72, level_db + 60))
self.level.set(level_display)
class Bus(ChannelLabelFrame): class Bus(ChannelLabelFrame):
@ -223,9 +231,18 @@ class Bus(ChannelLabelFrame):
def upd_levels(self): def upd_levels(self):
if self.index < self.parent.parent.kind.num_bus: if self.index < self.parent.parent.kind.num_bus:
if self.target.levels.is_updated or self.level.get() != -118: if self.target.levels.is_updated:
val = max(self.target.levels.all) val = max(self.target.levels.all)
self.level.set((0 if self.mute.get() else 72 + val - 12)) if val < -72:
if self.level.get() != 0:
self.level.set(0)
return
# Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
if self.mute.get():
level_display = 0
else:
level_display = max(0, min(72, val + 60))
self.level.set(level_display)
class ChannelFrame(ttk.Frame): class ChannelFrame(ttk.Frame):

View File

@ -98,7 +98,7 @@ class Config(ttk.Frame):
self.slider_vars[self.slider_params.index(param)].set(val) self.slider_vars[self.slider_params.index(param)].set(val)
def toggle_p(self, param): def toggle_p(self, param):
val = self.param_vars[self.params.index(param)].get() val = self.bool_param_vars[self.bool_params.index(param)].get()
self.setter(param, val) self.setter(param, val)
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
self.styletable.configure( self.styletable.configure(
@ -177,10 +177,9 @@ class StripConfig(Config):
for i, param in enumerate(self.virt_out_params) for i, param in enumerate(self.virt_out_params)
] ]
[ [
self.param_vars[i].set(self.getter(param)) self.bool_param_vars[i].set(self.getter(param))
for i, param in enumerate(self.params) for i, param in enumerate(self.bool_params)
] ]
if not _base_values.vban_connected: # slider vars not defined in RT Packet
[ [
self.slider_vars[i].set(self.getter(param)) self.slider_vars[i].set(self.getter(param))
for i, param in enumerate(self.slider_params) for i, param in enumerate(self.slider_params)
@ -207,7 +206,7 @@ class StripConfig(Config):
f'{param}.TButton', f'{param}.TButton',
background=f'{"green" if self.param_vars[i].get() else "white"}', background=f'{"green" if self.param_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.params) for i, param in enumerate(self.bool_params)
] ]
@ -238,53 +237,56 @@ class BusConfig(Config):
self.builder.create_bus_mode_button() self.builder.create_bus_mode_button()
def make_row_1(self): def make_row_1(self):
self.builder.create_bus_mono_button()
self.builder.create_param_buttons() self.builder.create_param_buttons()
def current_bus_mode(self): def current_bus_mode(self):
return self.target.mode.get() return self.target.mode.get()
def rotate_bus_modes_right(self, *args): def rotate_bus_modes_right(self, *args):
current_mode = self.current_bus_mode() current_mode = self.bus_mode_map_reverse[self.bus_mode_label_text.get()]
next = self.bus_modes.index(current_mode) + 1 current_index = self.bus_modes.index(current_mode)
if next < len(self.bus_modes): next_index = (current_index + 1) % len(self.bus_modes)
setattr( next_mode = self.bus_modes[next_index]
self.target.mode,
self.bus_modes[next], setattr(self.target.mode, next_mode, True)
True, self.bus_mode_label_text.set(self.bus_mode_map[next_mode])
)
self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[next]])
else:
self.target.mode.normal = True
self.bus_mode_label_text.set('Normal')
def rotate_bus_modes_left(self, *args): def rotate_bus_modes_left(self, *args):
current_mode = self.current_bus_mode() current_mode = self.bus_mode_map_reverse[self.bus_mode_label_text.get()]
prev = self.bus_modes.index(current_mode) - 1 current_index = self.bus_modes.index(current_mode)
if prev < 0: prev_index = (current_index - 1) % len(self.bus_modes)
self.target.mode.rearonly = True prev_mode = self.bus_modes[prev_index]
self.bus_mode_label_text.set('Rear Only')
else: setattr(self.target.mode, prev_mode, True)
setattr( self.bus_mode_label_text.set(self.bus_mode_map[prev_mode])
self.target.mode,
self.bus_modes[prev], def rotate_mono_right(self, *args):
True, current_val = self.mono_modes.index(self.bus_mono_label_text.get())
) next_val = (current_val + 1) % 3
self.bus_mode_label_text.set(self.bus_mode_map[self.bus_modes[prev]]) self.bus_mono_label_text.set(self.mono_modes[next_val])
self.setter('mono', next_val)
def rotate_mono_left(self, *args):
current_val = self.mono_modes.index(self.bus_mono_label_text.get())
next_val = (current_val - 1) % 3
self.bus_mono_label_text.set(self.mono_modes[next_val])
self.setter('mono', next_val)
def teardown(self): def teardown(self):
self.builder.teardown() self.builder.teardown()
def sync(self): def sync(self):
[ [
self.param_vars[i].set(self.getter(param)) self.bool_param_vars[i].set(self.getter(param))
for i, param in enumerate(self.params) for i, param in enumerate(self.bool_params)
] ]
self.bus_mode_label_text.set(self.bus_mode_map[self.current_bus_mode()]) self.bus_mode_label_text.set(self.bus_mode_map[self.current_bus_mode()])
if not _configuration.themes_enabled: if not _configuration.themes_enabled:
[ [
self.styletable.configure( self.styletable.configure(
f'{param}.TButton', f'{param}.TButton',
background=f'{"green" if self.param_vars[i].get() else "white"}', background=f'{"green" if self.bool_param_vars[i].get() else "white"}',
) )
for i, param in enumerate(self.params) for i, param in enumerate(self.bool_params)
] ]

View File

@ -161,17 +161,18 @@ class GainLayer(ttk.LabelFrame):
""" """
Updates level values. Updates level values.
""" """
if self.parent.target.strip[self.index].levels.is_updated: if self.parent.target.strip[self.index].levels.is_updated:
val = max(self.parent.target.strip[self.index].levels.prefader) val = max(self.parent.target.strip[self.index].levels.prefader)
self.level.set( # Convert dB to progressbar: -60dB=0, 0dB=60, +12dB=72
( if (
0 self.parent.parent.strip_frame.strips[self.index].mute.get()
if self.parent.parent.strip_frame.strips[self.index].mute.get()
or not self.on.get() or not self.on.get()
else 72 + val - 12 + self.gain.get() ):
) level_display = 0
) else:
level_db = val + self.gain.get()
level_display = max(0, min(72, level_db + 60))
self.level.set(level_display)
def grid_configure(self): def grid_configure(self):
self.grid(padx=_configuration.channel_xpadding, sticky=(tk.N, tk.S)) self.grid(padx=_configuration.channel_xpadding, sticky=(tk.N, tk.S))

View File

@ -421,7 +421,7 @@ class Menus(tk.Menu):
del self.parent.__dict__['userconfigs'] del self.parent.__dict__['userconfigs']
self.menu_setup() self.menu_setup()
self.after(500, self.enable_vban_menus) self.after(50, self.enable_vban_menus)
def documentation(self): def documentation(self):
webbrowser.open_new(r'https://voicemeeter.com/') webbrowser.open_new(r'https://voicemeeter.com/')