onyx_online/voicemeeter-compact
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/voicemeeter-compact.git synced 2024-11-21 20:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix math error in level updates

Browse Source
This commit is contained in:
onyx-and-iris 2022-10-05 23:39:51 +01:00
parent d7df79b798
commit 732368a65b
3 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "voicemeeter-compact" name = "voicemeeter-compact"
version = "1.6.3" version = "1.6.4"
description = "A Compact Voicemeeter Remote App" description = "A Compact Voicemeeter Remote App"
authors = ["onyx-and-iris <code@onyxandiris.online>"] authors = ["onyx-and-iris <code@onyxandiris.online>"]
license = "MIT" license = "MIT"

7
vmcompact/channels.py
View File

@ -185,14 +185,9 @@ class Strip(ChannelLabelFrame):
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)
if _base_values.vban_connected:
self.level.set( self.level.set(
(0 if self.mute.get() else 72 + val - 12 + self.gain.get()) (0 if self.mute.get() else 72 + val - 12 + self.gain.get())
) )
else:
self.level.set(
(0 if self.mute.get() else 72 + val + self.gain.get())
)
class Bus(ChannelLabelFrame): class Bus(ChannelLabelFrame):
@ -213,7 +208,7 @@ class Bus(ChannelLabelFrame):
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 or self.level.get() != -118:
val = max(self.target.levels.all) val = max(self.target.levels.all)
self.level.set((0 if self.mute.get() else 72 + val)) self.level.set((0 if self.mute.get() else 72 + val - 12))
class ChannelFrame(ttk.Frame): class ChannelFrame(ttk.Frame):

13
vmcompact/gainlayer.py
View File

@ -154,24 +154,13 @@ class GainLayer(ttk.LabelFrame):
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)
if _base_values.vban_connected:
self.level.set( self.level.set(
( (
0 0
if self.parent.target.strip[self.index].mute if self.parent.target.strip[self.index].mute or not self.on.get()
or not self.on.get()
else 72 + val - 12 + self.gain.get() else 72 + val - 12 + self.gain.get()
) )
) )
else:
self.level.set(
(
0
if self.parent.target.strip[self.index].mute
or not self.on.get()
else 72 + val + self.gain.get()
)
)
def grid_configure(self): def grid_configure(self):
[ [