diff options
| -rw-r--r-- | buttons.py | 32 | ||||
| -rw-r--r-- | console.py | 8 | ||||
| -rw-r--r-- | strips.py | 2 |
3 files changed, 21 insertions, 21 deletions
@@ -49,7 +49,7 @@ class Button(): def __init__(self, console, name): self.name = name self.state = 0 - self.console = None + self.console = console def press(self): self.state = 1 @@ -98,9 +98,9 @@ class StripSelButton(Button): print('handle_strip_sel', strip) if self.get('REC ENABLE', 0): if strip.recenable: - osc.client.sent_message('/strip/recenable', (strip.num, 0)) + osc.client.send_message('/strip/recenable', (strip.num, 0)) else: - osc.client.sent_message('/strip/recenable', (strip.num, 1)) + osc.client.send_message('/strip/recenable', (strip.num, 1)) super().press() @@ -115,10 +115,10 @@ class StripMuteButton(Button): strip = self.strip if strip.mute: strip.mute = False - osc.client.sent_message('/strip/mute', (strip.num, 0)) + osc.client.send_message('/strip/mute', (strip.num, 0)) else: strip.mute = True - osc.client.sent_message('/strip/mute', (strip.num, 1)) + osc.client.send_message('/strip/mute', (strip.num, 1)) super().press() @@ -133,10 +133,10 @@ class StripSoloButton(Button): strip = self.strip if strip.solo: strip.solo = False - osc.client.sent_message('/strip/solo', (strip.num, 0)) + osc.client.send_message('/strip/solo', (strip.num, 0)) else: strip.solo = True - osc.client.sent_message('/strip/solo', (strip.num, 1)) + osc.client.send_message('/strip/solo', (strip.num, 1)) super().press() @@ -175,7 +175,7 @@ class ComputerButton(Button): super().__init__(console, name) def press(self): - osc.client.sent_message('/set_surface', (8, 7, 19, 1, 8, 11)) + osc.client.send_message('/set_surface', (8, 7, 19, 1, 8, 11)) super().press() @@ -184,7 +184,7 @@ class ClrSoloButton(Button): super().__init__(console, name) def press(self): - osc.client.sent_message('/cancel_all_solos', 1) + osc.client.send_message('/cancel_all_solos', 1) super().press() @@ -195,10 +195,10 @@ class LoopButton(Button): def press(self, *args): if self.console.state.get('loop', 0): print('******* loop off') - osc.client.sent_message('/loop_toggle', 0) + osc.client.send_message('/loop_toggle', 0) else: print('******* loop on') - osc.client.sent_message('/loop_toggle', 1) + osc.client.send_message('/loop_toggle', 1) super().press() @@ -209,7 +209,7 @@ class TransportButton(Button): def press(self): addr = osc_addrs.get(self.name, None) if addr: - osc.client.sent_message(addr, 1) + osc.client.send_message(addr, 1) super().press() @@ -224,10 +224,10 @@ class BankSwitchButton(Button): print(direction, more_banks_up, more_banks_down) if direction > 0 and more_banks_up: print('calling /bank_up 1') - osc.client.sent_message('/bank_up', 1) + osc.client.send_message('/bank_up', 1) elif direction < 0 and more_banks_down: print('calling /bank_down 1') - osc.client.sent_message('/bank_down', 1) + osc.client.send_message('/bank_down', 1) super().press() @@ -240,9 +240,9 @@ class NudgeButton(Button): direction = self.direction print(direction) if direction > 0: - osc.client.sent_message('/access_action', + osc.client.send_message('/access_action', 'Common/nudge-next-forward') else: - osc.client.sent_message('/access_action', + osc.client.send_message('/access_action', 'Common/nudge-next-backward') super().press() @@ -78,7 +78,7 @@ class RunningStatusThread(): while True: for obj in self.callbacks: value = self.console.status.field(obj.status_quadlet, - **obj.status_bits, + *obj.status_bits, ) obj.status_callback(value) @@ -103,7 +103,7 @@ class Console(): self.unit.connect('control', self.handle_control) - status_thread = RunningStatusThread(self) # noqa F841 + self.status_thread = RunningStatusThread(self) # noqa F841 @property def status(self): @@ -116,7 +116,7 @@ class Console(): changed = before ^ after - for bit in [i for i, b in enumerate(bits32(changed)) if int(b)]: + for bit in [i for i, b in enumerate(reversed(bits32(changed))) if int(b)]: high = bool(after & (0b1 << bit)) button = self.buttons[index][int(bit)] if button is None: @@ -128,7 +128,7 @@ class Console(): else: button.press() - def handle_control(self, index, before, after): + def handle_control(self, unit, index, before, after): print('{0:02d}: {1:08x} {2:08x}'.format(index, before, after)) @@ -37,7 +37,7 @@ class Strip(): self._select = False self._rec = False self.pan = 0.5 - self.fader = Fader(self.console.unit, self) + self.fader = Fader(self.console, self) self.name = None @property |