onyx_online/voicemeeter-compact
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/voicemeeter-compact.git synced 2024-09-27 14:56:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor ldirty, add reinitialize level arrays in _make_app

Browse Source 
refactor set ldirty.

reinitialize level arrays in _make_app (when switching between local,network connection)
This commit is contained in:
onyx-and-iris 2022-04-17 09:27:27 +01:00
parent cd4264be8b
commit da9e538cc7
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmcompact/app.py
View File

@ -65,7 +65,7 @@ class App(tk.Tk):
self.styletable = ttk.Style() self.styletable = ttk.Style()
self._vmr = vmr self._vmr = vmr
# start pdirty watcher # start watchers, initialize level arrays
self.upd_pdirty() self.upd_pdirty()
self.strip_levels = self.target.strip_levels self.strip_levels = self.target.strip_levels
self.bus_levels = self.target.bus_levels self.bus_levels = self.target.bus_levels
@ -135,6 +135,8 @@ class App(tk.Tk):
) )
self._vban = vban self._vban = vban
self.kind = kind self.kind = kind
self.strip_levels = self.target.strip_levels
self.bus_levels = self.target.bus_levels
self._make_top_level_frames() self._make_top_level_frames()
@ -184,7 +186,7 @@ class App(tk.Tk):
self.comp_strip = [not a == b for a, b in zip(self.strip_levels, _strip_levels)] self.comp_strip = [not a == b for a, b in zip(self.strip_levels, _strip_levels)]
self.comp_bus = [not a == b for a, b in zip(self.bus_levels, _bus_levels)] self.comp_bus = [not a == b for a, b in zip(self.bus_levels, _bus_levels)]
self.ldirty = any(self.comp_strip) or any(self.comp_bus) self.ldirty = any(any(l) for l in (self.comp_strip, self.comp_bus))
if self.ldirty: if self.ldirty:
self.strip_levels = _strip_levels self.strip_levels = _strip_levels
self.bus_levels = _bus_levels self.bus_levels = _bus_levels

14
vmcompact/channels.py
View File

@ -346,15 +346,15 @@ class ChannelFrame(ttk.Frame):
# create labelframes # create labelframes
if is_strip: if is_strip:
self.strips = [ self.strips = tuple(
Strip(self, i, self.identifier) Strip(self, i, self.identifier)
for i in range(self.phys_in + self.virt_in) for i in range(self.phys_in + self.virt_in)
] )
else: else:
self.buses = [ self.buses = tuple(
Bus(self, i, self.identifier) Bus(self, i, self.identifier)
for i in range(self.phys_out + self.virt_out) for i in range(self.phys_out + self.virt_out)
] )
# position label frames. destroy any without label text # position label frames. destroy any without label text
self.labelframes = self.strips if is_strip else self.buses self.labelframes = self.strips if is_strip else self.buses
@ -367,6 +367,12 @@ class ChannelFrame(ttk.Frame):
self.columnconfigure(i, minsize=0) self.columnconfigure(i, minsize=0)
labelframe.grid_remove() labelframe.grid_remove()
for i, labelframe in enumerate(self.labelframes):
labelframe.grid(row=0, column=i)
if not labelframe.cget("text"):
self.columnconfigure(i, minsize=0)
labelframe.grid_remove()
@property @property
def target(self): def target(self):
"""returns the current interface""" """returns the current interface"""