flag value

This commit is contained in:
onyx-and-iris 2026-03-03 15:48:09 +00:00
parent 7b3149a1e1
commit 5b3b35fca3
2 changed files with 18 additions and 16 deletions

View File

@ -28,7 +28,7 @@ def channel_bool_prop(param):
elif param.lower() == 'mc': elif param.lower() == 'mc':
return channel_state.mc return channel_state.mc
else: else:
return channel_state.get_mode(getattr(ChannelModes, param.upper())) return channel_state.get_mode(getattr(ChannelModes, param.upper()).value)
def fset(self, val): def fset(self, val):
self.setter(param, 1 if val else 0) self.setter(param, 1 if val else 0)
@ -56,7 +56,9 @@ def channel_int_prop(param):
bit_9 = (channel_state._state >> 9) & 1 bit_9 = (channel_state._state >> 9) & 1
return (bit_9 << 1) | bit_2 return (bit_9 << 1) | bit_2
else: 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): def fset(self, val):
self.setter(param, 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] 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): def fset(self, val):
self.setter(param, 1 if val else 0) self.setter(param, 1 if val else 0)

View File

@ -32,57 +32,57 @@ class ChannelState:
# Common boolean modes # Common boolean modes
@property @property
def mute(self) -> bool: def mute(self) -> bool:
return (self._state & ChannelModes.MUTE) != 0 return (self._state & ChannelModes.MUTE.value) != 0
@property @property
def solo(self) -> bool: def solo(self) -> bool:
return (self._state & ChannelModes.SOLO) != 0 return (self._state & ChannelModes.SOLO.value) != 0
@property @property
def mono(self) -> bool: def mono(self) -> bool:
return (self._state & ChannelModes.MONO) != 0 return (self._state & ChannelModes.MONO.value) != 0
@property @property
def mc(self) -> bool: def mc(self) -> bool:
return (self._state & ChannelModes.MC) != 0 return (self._state & ChannelModes.MC.value) != 0
# EQ modes # EQ modes
@property @property
def eq_on(self) -> bool: def eq_on(self) -> bool:
return (self._state & ChannelModes.ON) != 0 return (self._state & ChannelModes.ON.value) != 0
@property @property
def eq_ab(self) -> bool: def eq_ab(self) -> bool:
return (self._state & ChannelModes.AB) != 0 return (self._state & ChannelModes.AB.value) != 0
# Bus assignments (strip to bus routing) # Bus assignments (strip to bus routing)
@property @property
def busa1(self) -> bool: def busa1(self) -> bool:
return (self._state & ChannelModes.BUSA1) != 0 return (self._state & ChannelModes.BUSA1.value) != 0
@property @property
def busa2(self) -> bool: def busa2(self) -> bool:
return (self._state & ChannelModes.BUSA2) != 0 return (self._state & ChannelModes.BUSA2.value) != 0
@property @property
def busa3(self) -> bool: def busa3(self) -> bool:
return (self._state & ChannelModes.BUSA3) != 0 return (self._state & ChannelModes.BUSA3.value) != 0
@property @property
def busa4(self) -> bool: def busa4(self) -> bool:
return (self._state & ChannelModes.BUSA4) != 0 return (self._state & ChannelModes.BUSA4.value) != 0
@property @property
def busb1(self) -> bool: def busb1(self) -> bool:
return (self._state & ChannelModes.BUSB1) != 0 return (self._state & ChannelModes.BUSB1.value) != 0
@property @property
def busb2(self) -> bool: def busb2(self) -> bool:
return (self._state & ChannelModes.BUSB2) != 0 return (self._state & ChannelModes.BUSB2.value) != 0
@property @property
def busb3(self) -> bool: def busb3(self) -> bool:
return (self._state & ChannelModes.BUSB3) != 0 return (self._state & ChannelModes.BUSB3.value) != 0
class States(NamedTuple): class States(NamedTuple):