diff --git a/vban_cmd/meta.py b/vban_cmd/meta.py index 9b280c9..ea40e80 100644 --- a/vban_cmd/meta.py +++ b/vban_cmd/meta.py @@ -28,7 +28,7 @@ def channel_bool_prop(param): elif param.lower() == 'mc': return channel_state.mc else: - return channel_state.get_mode(getattr(ChannelModes, param.upper())) + return channel_state.get_mode(getattr(ChannelModes, param.upper()).value) def fset(self, val): self.setter(param, 1 if val else 0) @@ -56,7 +56,9 @@ def channel_int_prop(param): bit_9 = (channel_state._state >> 9) & 1 return (bit_9 << 1) | bit_2 else: - return channel_state.get_mode_int(getattr(ChannelModes, param.upper())) + return channel_state.get_mode_int( + getattr(ChannelModes, param.upper()).value + ) def fset(self, val): self.setter(param, val) @@ -90,7 +92,7 @@ def strip_output_prop(param): strip_state = self.public_packets[NBS.zero].states.strip[self.index] - return strip_state.get_mode(getattr(ChannelModes, f'BUS{param.upper()}')) + return strip_state.get_mode(getattr(ChannelModes, f'BUS{param.upper()}').value) def fset(self, val): self.setter(param, 1 if val else 0) diff --git a/vban_cmd/packet/nbs0.py b/vban_cmd/packet/nbs0.py index b533b79..3e3e2a8 100644 --- a/vban_cmd/packet/nbs0.py +++ b/vban_cmd/packet/nbs0.py @@ -32,57 +32,57 @@ class ChannelState: # Common boolean modes @property def mute(self) -> bool: - return (self._state & ChannelModes.MUTE) != 0 + return (self._state & ChannelModes.MUTE.value) != 0 @property def solo(self) -> bool: - return (self._state & ChannelModes.SOLO) != 0 + return (self._state & ChannelModes.SOLO.value) != 0 @property def mono(self) -> bool: - return (self._state & ChannelModes.MONO) != 0 + return (self._state & ChannelModes.MONO.value) != 0 @property def mc(self) -> bool: - return (self._state & ChannelModes.MC) != 0 + return (self._state & ChannelModes.MC.value) != 0 # EQ modes @property def eq_on(self) -> bool: - return (self._state & ChannelModes.ON) != 0 + return (self._state & ChannelModes.ON.value) != 0 @property def eq_ab(self) -> bool: - return (self._state & ChannelModes.AB) != 0 + return (self._state & ChannelModes.AB.value) != 0 # Bus assignments (strip to bus routing) @property def busa1(self) -> bool: - return (self._state & ChannelModes.BUSA1) != 0 + return (self._state & ChannelModes.BUSA1.value) != 0 @property def busa2(self) -> bool: - return (self._state & ChannelModes.BUSA2) != 0 + return (self._state & ChannelModes.BUSA2.value) != 0 @property def busa3(self) -> bool: - return (self._state & ChannelModes.BUSA3) != 0 + return (self._state & ChannelModes.BUSA3.value) != 0 @property def busa4(self) -> bool: - return (self._state & ChannelModes.BUSA4) != 0 + return (self._state & ChannelModes.BUSA4.value) != 0 @property def busb1(self) -> bool: - return (self._state & ChannelModes.BUSB1) != 0 + return (self._state & ChannelModes.BUSB1.value) != 0 @property def busb2(self) -> bool: - return (self._state & ChannelModes.BUSB2) != 0 + return (self._state & ChannelModes.BUSB2.value) != 0 @property def busb3(self) -> bool: - return (self._state & ChannelModes.BUSB3) != 0 + return (self._state & ChannelModes.BUSB3.value) != 0 class States(NamedTuple):