From 1d29e5113ce2c1635f8cbf47ec02ff98879a2bc6 Mon Sep 17 00:00:00 2001
From: onyx-and-iris <75868496+onyx-and-iris@users.noreply.github.com>
Date: Thu, 14 Apr 2022 17:41:46 +0100
Subject: [PATCH] factorise watch level

factorise watch level
---
 vmcompact/channels.py  | 19 +------------------
 vmcompact/gainlayer.py | 26 +-------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/vmcompact/channels.py b/vmcompact/channels.py
index 39569a4..4d6aade 100644
--- a/vmcompact/channels.py
+++ b/vmcompact/channels.py
@@ -216,24 +216,7 @@ class Strip(Channel):
                 and _base_vals.strip_level_array_size
                 == len(self._parent._parent.comp_strip)
             ):
-                if self.index <= self._parent.phys_in and any(
-                    self._parent._parent.comp_strip[
-                        self.level_offset : self.level_offset + 1
-                    ]
-                ):
-                    vals = (
-                        self.convert_level(
-                            self._parent._parent.strip_levels[self.level_offset]
-                        ),
-                        self.convert_level(
-                            self._parent._parent.strip_levels[self.level_offset + 1]
-                        ),
-                    )
-                    peak = vals[0] if vals[0] > vals[1] else vals[1]
-                    self.level.set(
-                        (0 if self.mute.get() else 100 + (peak - 18) + self.gain.get())
-                    )
-                elif any(
+                if any(
                     self._parent._parent.comp_strip[
                         self.level_offset : self.level_offset + 1
                     ]
diff --git a/vmcompact/gainlayer.py b/vmcompact/gainlayer.py
index b6c8c0e..6e8a442 100644
--- a/vmcompact/gainlayer.py
+++ b/vmcompact/gainlayer.py
@@ -171,31 +171,7 @@ class GainLayer(ttk.LabelFrame):
                 and _base_vals.strip_level_array_size
                 == len(self._parent._parent.comp_strip)
             ):
-                if self.index <= self._parent.phys_in and any(
-                    self._parent._parent.comp_strip[
-                        self.level_offset : self.level_offset + 1
-                    ]
-                ):
-                    vals = (
-                        self.convert_level(
-                            self._parent._parent.strip_levels[self.level_offset]
-                        ),
-                        self.convert_level(
-                            self._parent._parent.strip_levels[self.level_offset + 1]
-                        ),
-                    )
-                    peak = vals[0] if vals[0] > vals[1] else vals[1]
-                    self.level.set(
-                        (
-                            0
-                            if self._parent._parent.channel_frame.strips[
-                                self.index
-                            ].mute.get()
-                            or not self.on.get()
-                            else 100 + (peak - 18) + self.gain.get()
-                        )
-                    )
-                elif any(
+                if any(
                     self._parent._parent.comp_strip[
                         self.level_offset : self.level_offset + 1
                     ]