diff --git a/pyproject.toml b/pyproject.toml index bdde717..d8c91f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "voicemeeter-compact" -version = "1.6.3" +version = "1.6.4" description = "A Compact Voicemeeter Remote App" authors = ["onyx-and-iris "] license = "MIT" diff --git a/vmcompact/channels.py b/vmcompact/channels.py index 9371587..f5323d5 100644 --- a/vmcompact/channels.py +++ b/vmcompact/channels.py @@ -185,14 +185,9 @@ class Strip(ChannelLabelFrame): if self.index < self.parent.parent.kind.num_strip: if self.target.levels.is_updated: val = max(self.target.levels.prefader) - if _base_values.vban_connected: - self.level.set( - (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()) - ) + self.level.set( + (0 if self.mute.get() else 72 + val - 12 + self.gain.get()) + ) class Bus(ChannelLabelFrame): @@ -213,7 +208,7 @@ class Bus(ChannelLabelFrame): if self.index < self.parent.parent.kind.num_bus: if self.target.levels.is_updated or self.level.get() != -118: 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): diff --git a/vmcompact/gainlayer.py b/vmcompact/gainlayer.py index 76cd8f9..71deb06 100644 --- a/vmcompact/gainlayer.py +++ b/vmcompact/gainlayer.py @@ -154,24 +154,13 @@ class GainLayer(ttk.LabelFrame): if self.parent.target.strip[self.index].levels.is_updated: val = max(self.parent.target.strip[self.index].levels.prefader) - if _base_values.vban_connected: - self.level.set( - ( - 0 - if self.parent.target.strip[self.index].mute - or not self.on.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() - ) + self.level.set( + ( + 0 + if self.parent.target.strip[self.index].mute or not self.on.get() + else 72 + val - 12 + self.gain.get() ) + ) def grid_configure(self): [