From 919c96702311896c77b888b6412d325ebee11768 Mon Sep 17 00:00:00 2001
From: onyx-and-iris <75868496+onyx-and-iris@users.noreply.github.com>
Date: Sat, 19 Mar 2022 09:51:48 +0000
Subject: [PATCH] add modevals to Modes class.

add modevals to Modes class.
---
 vbancmd/channel.py |  8 ++++++++
 vbancmd/meta.py    | 31 +++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/vbancmd/channel.py b/vbancmd/channel.py
index 0565de1..b509bcb 100644
--- a/vbancmd/channel.py
+++ b/vbancmd/channel.py
@@ -54,6 +54,14 @@ class Modes:
     _sel:       hex=0x10000000
     _monitor:   hex=0x20000000
 
+    @property
+    def modevals(self):
+        return (val for val in [
+            self._normal, self._amix, self._repeat, self._bmix, self._composite,
+            self._tvmix, self._upmix21, self._upmix41, self._upmix61, self._centeronly,
+            self._lfeonly, self._rearonly,
+        ])
+
 
 class Channel(abc.ABC):
     """ Base class for InputStrip and OutputBus. """
diff --git a/vbancmd/meta.py b/vbancmd/meta.py
index a98f30d..4cd9b2a 100644
--- a/vbancmd/meta.py
+++ b/vbancmd/meta.py
@@ -16,28 +16,23 @@ def bus_mode_prop(param):
     def fget(self):
         data = self.public_packet
         modes = {
-            'normal': (False,False,False,False,False,False,False,False,False,False,False,False),
-            'amix': (False,True,True,False,False,True,False,True,False,True,False,True),
-            'bmix': (False,True,True,True,False,True,True,True,False,True,True,True),
-            'repeat': (False,False,True,True,False,False,True,True,False,False,True,True),
-            'composite': (False,False,False,False,True,True,True,True,False,False,False,False),
-            'tvmix': (False,True,True,False,True,True,True,True,False,True,False,True),
-            'upmix21': (False,False,True,True,True,True,True,True,False,False,True,True),
-            'upmix41': (False,True,True,True,True,True,True,True,False,True,True,True),
-            'upmix61': (False,False,False,False,False,False,False,False,True,True,True,True),
-            'centeronly': (False,True,True,False,False,True,False,True,True,True,True,True),
-            'lfeonly': (False,False,True,True,False,False,True,True,True,True,True,True),
-            'rearonly': (False,True,True,True,False,True,True,True,True,True,True,True),
+            'normal': (False, False, False, False, False, False, False, False, False, False, False, False),
+            'amix': (False, True, False, True, False, True, False, True, False, True, False, True),
+            'repeat': (False, False, True, True, False, False, True, True, False, False, True, True),
+            'bmix': (False, True, True, True, False, True, True, True, False, True, True, True),
+            'composite': (False, False, False, False, True, True, True, True, False, False, False, False),
+            'tvmix': (False, True, False, True, True, True, True, True, False, True, False, True),
+            'upmix21': (False, False, True, True, True, True, True, True, False, False, True, True),
+            'upmix41': (False, True, True, True, True, True, True, True, False, True, True, True),
+            'upmix61': (False, False, False, False, False, False, False, False, True, True, True, True),
+            'centeronly': (False, True, False, True, False, True, False, True, True, True, True, True),
+            'lfeonly': (False, False, True, True, False, False, True, True, True, True, True, True),
+            'rearonly': (False, True, True, True, False, True, True, True, True, True, True, True),
         }
-        vals = tuple(
-            not int.from_bytes(data.busstate[self.index], 'little') & getattr(self._modes, f'_{param.lower()}') == 0
-            for param in ['normal', 'Amix', 'Bmix', 'Repeat', 'Composite', 'TVMix', 'UpMix21',
-            'UpMix41', 'UpMix61', 'CenterOnly', 'LFEOnly', 'RearOnly']
-        )
+        vals = tuple(not int.from_bytes(data.busstate[self.index], 'little') & val == 0 for val in self._modes.modevals)
         return vals == modes[param.lower()]
     def fset(self, val):
         if not isinstance(val, bool) and val not in (0, 1):
             raise VMCMDErrors(f'mode.{param} is a boolean parameter')
         self.setter(f'mode.{param}', 1 if val else 0)
     return property(fget, fset)
-