Remove the sound-reactive cans from the test show.
The Sound and Threshold audio triggers go, with the Sound submaster beside the cans' Front and Back sliders (CC 100) and the Sound peak frame with its Peak submaster and Hit button and the Cans hit functions only Hit ran. Pads 1 and 2 are plain spare buttons again (scripts/shows/drop_sound.py). The pads frame's own Peak (knob 6) stays: it is the chases' peak. The pad controller drops its side of it: the Pump and Threshold modes, the CC 100 resets, holding the side knobs at the peak and the pad lamps that showed which mode was on. Pads 1 and 2 and knobs 5, 6 and 8 pass straight through. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
3b38df3dd0
commit
e7e1cf656b
6 files changed
+92
-349
No files matched your search
+6
-76
@@ -6,30 +6,7 @@ second set of buttons from the first. Play itself is not passed on.
|
||||
|
||||
Pause (CC 28) does the same for bank 1, but toggles: each press flips it.
|
||||
Off, bank 1 pads 36–51 go out as they are, for the cans. On, they go out as
|
||||
84–99, for the movers. Pause itself is not passed on. The movers are not
|
||||
sound reactive, so Sound and Threshold (84 and 85) do nothing on their layer.
|
||||
|
||||
The Sound pad (note 36) toggles QLC+'s audio triggers, which pump the cans'
|
||||
Sound submaster in the Dimmers frame. Every press and release also sends CC 100
|
||||
at full, so switching sound off leaves the cans at full rather than wherever
|
||||
the music left them.
|
||||
|
||||
The Threshold pad (note 37) toggles a second audio trigger, which flashes the
|
||||
cans to full on bass hits. While it is on, CC 100 is held at 0 so the cans sit
|
||||
dark between hits; switching it off puts the submaster back to full.
|
||||
|
||||
The two are exclusive: turning one on taps the other's note first when it is
|
||||
on, so QLC+ switches it off.
|
||||
|
||||
Knob 6 (CC 35) is the sides' peak. It goes on to the Peak submasters, which
|
||||
set how bright the Threshold hits, the chases and the strobe flash. While Sound is on,
|
||||
it also holds both side sliders (knobs 5 and 8, CC 34 and 37) at its value, so
|
||||
the bass pumps the sides up to it; turns of knobs 5 and 8 meanwhile are kept
|
||||
and put back when Sound goes off.
|
||||
|
||||
pump and threshold follow the two pads' presses, so the pad controller can
|
||||
light whichever is on. QLC+ sends no feedback for its audio triggers, so they
|
||||
are only a guess; reopen() clears them, as QLC+ starts with both off.
|
||||
84–99, for the movers. Pause itself is not passed on.
|
||||
|
||||
colours holds the last colour pad pressed in each set, as sent (52–67 for the
|
||||
cans, 68–83 for the movers), or None once it is pressed again: the colour
|
||||
@@ -43,7 +20,7 @@ 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.
|
||||
EFX is on, from the presses: only a guess, as QLC+ sends no feedback for it.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -56,12 +33,7 @@ PAUSE_CC = 28
|
||||
BANK_1_FIRST = 36
|
||||
BANK_1_LAST = 51
|
||||
MOVERS_SHIFT = 48 # bank 1 goes out as 84–99 while Pause is on, above bank 2's held layer
|
||||
SOUND_NOTE = 36
|
||||
THRESHOLD_NOTE = 37
|
||||
SUBMASTER_CC = 100
|
||||
KNOB_CHANNEL = 0
|
||||
PEAK_CC = 35 # knob 6
|
||||
SIDE_CCS = (34, 37) # knobs 5 and 8: Cans 9–15 and Cans 1, 2, 7, 8
|
||||
# Wander, Ballyhoo, Circle, Sweep; Diamond, Square, Corners, Leaf; Tilt: pads 13–16, 9–12, 5
|
||||
RELATIVE_NOTES = (96, 97, 98, 99, 92, 93, 94, 95, 88)
|
||||
POSITION_CCS = (38, 39) # knobs 9 and 10: the movers' Pan and Tilt
|
||||
@@ -73,10 +45,6 @@ class PlayLayer:
|
||||
self.movers = False # Pause toggles bank 1 between the cans and the movers
|
||||
# (channel, note as pressed) -> note sent, so a release matches its press
|
||||
self.sent: dict[tuple[int, int], int] = {}
|
||||
self.pump = False
|
||||
self.threshold = False
|
||||
# Last value of each knob below, from the pad; QLC+ starts them at full.
|
||||
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: int | None = None
|
||||
@@ -96,11 +64,6 @@ class PlayLayer:
|
||||
if data[2] > 0:
|
||||
self.movers = not self.movers
|
||||
return []
|
||||
if kind == 0xB0 and len(data) >= 3 and channel == KNOB_CHANNEL and data[1] in self.knobs:
|
||||
self.knobs[data[1]] = data[2]
|
||||
if data[1] == PEAK_CC:
|
||||
return [list(data), *self.sides()]
|
||||
return [] if self.pump else [list(data)]
|
||||
if kind == 0xB0 and len(data) >= 3 and channel == KNOB_CHANNEL and data[1] in self.position:
|
||||
self.position[data[1]] = data[2]
|
||||
return [list(data)]
|
||||
@@ -114,26 +77,7 @@ class PlayLayer:
|
||||
else:
|
||||
out = self.sent.pop(key, data[1])
|
||||
note = out
|
||||
before: list[list[int]] = []
|
||||
extra: list[list[int]] = []
|
||||
if note == SOUND_NOTE:
|
||||
if is_on:
|
||||
if self.threshold:
|
||||
before = tap(channel, THRESHOLD_NOTE)
|
||||
self.threshold = False
|
||||
self.pump = not self.pump
|
||||
extra = self.sides(restore=not self.pump)
|
||||
# Again on release, after any spectrum frame QLC+ still had queued
|
||||
extra = [*extra, [0xB0, SUBMASTER_CC, 127]]
|
||||
elif note == THRESHOLD_NOTE:
|
||||
if is_on:
|
||||
if self.pump:
|
||||
before = tap(channel, SOUND_NOTE)
|
||||
self.pump = False
|
||||
extra = self.sides(restore=True)
|
||||
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 RELATIVE_NOTES and is_on:
|
||||
if note == self.moving:
|
||||
self.moving = None
|
||||
self.settle = True
|
||||
@@ -143,7 +87,7 @@ class PlayLayer:
|
||||
colour_set = 1 if out <= LAST_NOTE else 2
|
||||
pressed = (channel, out)
|
||||
self.colours[colour_set] = None if self.colours[colour_set] == pressed else pressed
|
||||
return [*before, [status, out, *data[2:]], *extra]
|
||||
return [[status, out, *data[2:]]]
|
||||
|
||||
def shifted(self, note: int) -> int:
|
||||
"""The note a press goes out as: bank 2 up while Play is held, bank 1 up while Pause is on."""
|
||||
@@ -154,27 +98,13 @@ class PlayLayer:
|
||||
return note
|
||||
|
||||
def reopen(self) -> list[list[int]]:
|
||||
"""QLC+ has loaded the show: everything is off. Press the colours that were on.
|
||||
|
||||
The Sound submaster goes back to full too, as sound is off.
|
||||
"""
|
||||
self.pump = False
|
||||
self.threshold = False
|
||||
"""QLC+ has loaded the show: everything is off. Press the colours that were on."""
|
||||
self.moving = None
|
||||
out = []
|
||||
for colour in self.colours.values():
|
||||
if colour is not None:
|
||||
out += tap(*colour)
|
||||
return out + [[0xB0, SUBMASTER_CC, 127]]
|
||||
|
||||
def sides(self, restore: bool = False) -> list[list[int]]:
|
||||
"""The side sliders at the peak while Sound is on, or back at their own knobs."""
|
||||
if restore:
|
||||
return [[0xB0 | KNOB_CHANNEL, cc, self.knobs[cc]] for cc in SIDE_CCS]
|
||||
if not self.pump:
|
||||
return []
|
||||
return [[0xB0 | KNOB_CHANNEL, cc, self.knobs[PEAK_CC]] for cc in SIDE_CCS]
|
||||
|
||||
return out
|
||||
|
||||
def nudge(self) -> list[list[int]]:
|
||||
"""Pan and Tilt one step off their knobs, so QLC+ writes them again."""
|
||||
|
||||
Reference in new issue
Block a user