Run the movers' Wander and Ballyhoo one at a time.
Their two buttons go into a Movement solo frame where they sit, so starting one stops the other (scripts/shows/mover_movement_solo.py). The pad controller follows: it tracks the one that is on, and settles the knobs only when that one goes off. Swapping needs no settle, as the new EFX writes over the old one's offset. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
09aab70bd6
commit
80df550916
4 files changed
+120
-42
No files matched your search
+12
-8
@@ -38,10 +38,12 @@ reopen() presses them again when QLC+ loads the show.
|
||||
|
||||
The movers' Wander and Ballyhoo pads (notes 96 and 97, pads 13 and 14 on the
|
||||
movers layer) each toggle a relative EFX around the Pan and Tilt knobs (9 and 10,
|
||||
CC 38 and 39). QLC+ 4.12 leaves an EFX's last offset on the movers when it stops,
|
||||
until those sliders change, so when either goes off, settle asks for the two
|
||||
knobs one step off and then back (nudge() and positions()). moving holds the
|
||||
notes whose EFX is on, from the presses: a guess like pump.
|
||||
CC 38 and 39). They share a solo frame in QLC+, so starting one stops the other.
|
||||
QLC+ 4.12 leaves an EFX's last offset on the movers when it stops, until those
|
||||
sliders change, so when the one that is on goes off, settle asks for the two
|
||||
knobs one step off and then back (nudge() and positions()). Swapping needs
|
||||
none: the new EFX writes over the old one's offset. moving holds the note whose
|
||||
EFX is on, from the presses: a guess like pump.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -76,7 +78,7 @@ class PlayLayer:
|
||||
self.knobs = {cc: 127 for cc in (PEAK_CC, *SIDE_CCS)}
|
||||
# Pan and Tilt as last sent; QLC+ starts them at 0.
|
||||
self.position = {cc: 0 for cc in POSITION_CCS}
|
||||
self.moving: set[int] = set()
|
||||
self.moving: int | None = None
|
||||
self.settle = False # a relative EFX just went off: the caller sends nudge(), then positions()
|
||||
# set -> (channel, note sent) of the colour that is on
|
||||
self.colours: dict[int, tuple[int, int] | None] = {1: None, 2: None}
|
||||
@@ -131,9 +133,11 @@ class PlayLayer:
|
||||
self.threshold = not self.threshold
|
||||
extra = [*extra, [0xB0, SUBMASTER_CC, 0 if self.threshold else 127]]
|
||||
elif note in RELATIVE_NOTES and is_on:
|
||||
if note in self.moving:
|
||||
if note == self.moving:
|
||||
self.moving = None
|
||||
self.settle = True
|
||||
self.moving ^= {note}
|
||||
else:
|
||||
self.moving = note
|
||||
if is_on and FIRST_NOTE <= out <= LAST_NOTE + SHIFT:
|
||||
colour_set = 1 if out <= LAST_NOTE else 2
|
||||
pressed = (channel, out)
|
||||
@@ -155,7 +159,7 @@ class PlayLayer:
|
||||
"""
|
||||
self.pump = False
|
||||
self.threshold = False
|
||||
self.moving.clear()
|
||||
self.moving = None
|
||||
out = []
|
||||
for colour in self.colours.values():
|
||||
if colour is not None:
|
||||
|
||||
Reference in new issue
Block a user