tweaks

Author: danja

TODO.md

@@ -175,11 +175,13 @@ Remaining:
   ASan/UBSan: scales against the docs, walk statistics, order 2, learning, locate and block-size
   independence, Conductor, state format). Not yet auditioned in a host: try each style, Order 2 after
   learning a line, and Learned mix at 50%. Open: learning assumes one melodic line (chords blur the counts);
-  the matrix editor is click-to-cycle only (no drag-painting or right-click to decrement); the plugin does
+  the matrix editor has click-to-cycle, drag-to-paint and right-click-to-zero but no undo; the plugin does
   not pass incoming MIDI through; the editor does not move while a CC drives a control.
 * **Conductor awareness** was added to `lifeform`, `polymeter` and `xoxolo` (off by default; not yet auditioned
-  in a host). Still without it among the generators: `arpgen`, `cadence`, `counterpointer`, `luma`,
-  `mnemosyne`, `m-mix`, `sidecar`, `tuney-vst`. Worth adding where a density or energy knob exists.
+  in a host). `counterpointer` and `cadence` followed (the CC mapping is a tested pure function,
+  `applyConductorCc`, in their core-types headers; CC 24 relearns). Still without it among the generators:
+  `arpgen`, `luma`, `mnemosyne`, `m-mix`, `sidecar` (its wrapper is tangled up with the server path),
+  `tuney-vst`. Worth adding where a density or energy knob exists.
 * Later candidate: chord-graph walker. A shared voice-leading helper in
   generative-common is only worth it if a second plugin needs it (shared code, needs approval).
 

docs/midi-mapping.md

@@ -171,6 +171,32 @@ Xoxolo gains a MIDI input and three parameters: **Conductor Ch** (`conductor_ch`
 
 CC 20 (Scene) is not mapped. The mutation shift is performance state and is not saved with the project.
 
+## Counterpointer mapping
+
+Counterpointer gains one parameter, **Conductor** (`conductor_ch`, 0-16, default 0 = off).
+
+| CC | Conductor name | Counterpointer control | Notes |
+|----|---------------|------------------------|-------|
+| 21 | Density | `density` | How often the counter-line plays |
+| 22 | Energy | `embellish` | Ornamentation around the line |
+| 23 | Mutation | `short_random` | Short-range randomness |
+| 24 | Reset | relearn (trigger) | Fires when CC value = 127; learns the incoming line afresh |
+
+CC 20 (Scene) is not mapped.
+
+## Cadence mapping
+
+Cadence gains one parameter, **Conductor Ch** (`conductor_ch`, 0-16, default 0 = off).
+
+| CC | Conductor name | Cadence control | Notes |
+|----|---------------|-----------------|-------|
+| 21 | Density | `complexity` | Harmonic richness |
+| 22 | Energy | `movement` | How much the harmony moves |
+| 23 | Mutation | `vary` | Variation |
+| 24 | Reset | relearn (trigger) | Fires when CC value = 127; learns the incoming harmony afresh |
+
+CC 20 (Scene) is not mapped.
+
 ## Markov mapping
 
 Markov has one parameter for Conductor reception, **Conductor ch** (`conductor_ch`, 0-16, default 0 = off).

docs/pages/_products/cadence.md

@@ -23,6 +23,12 @@ dominants. The extended chord mode can voice 9ths, 11ths, and 13ths. Spread
 opens the voicing range, and Arpeggio moves playback from solid chords toward
 broken fragments or rotating single-note chord tones.
 
+### Conductor integration
+
+Set **Conductor Ch** (0 = off, 1-16) to the channel Conductor uses (default 16). CC 21 drives Complexity,
+CC 22 Movement, CC 23 Variation, and CC 24 (value 127) relearns, so each section can start from fresh
+harmony. CC 20 (Scene) is not used. See [MIDI Mapping](../../midi-mapping.md).
+
 ### Status
 
 This basically works as intended though a little more work is needed in fine-tuning the user interface, it could be more intuitive.

docs/pages/_products/counterpointer.md

@@ -24,6 +24,13 @@ introduced.
 back after a leap of a fourth or more and to keep going after a step. It applies in
 Counterpoint mode, not Bass Descend. Idea from [Subsequence](https://subsystem.co/subsequence).
 
+### Conductor integration
+
+Set **Conductor** (0 = off, 1-16) to the channel Conductor uses (default 16). CC 21 drives Density, CC 22
+Embellish (how much ornament surrounds the line), CC 23 Short Rnd (how often it deviates), and CC 24 (value
+127) relearns, so each new section starts by listening afresh. CC 20 (Scene) is not used. Conductor CCs
+are not mistaken for notes to learn. See [MIDI Mapping](../../midi-mapping.md).
+
 ### Status
 
 Functional, as far as it goes, but could maybe be improved with more deterministic patterns. 

docs/pages/_products/markov.md

@@ -26,7 +26,7 @@ The melody is a random walk over the twelve pitch classes, counted from the **Ro
 matrix on screen has a row for the note just played and a column for each note that may follow it;
 each cell's weight (0 to 8) says how likely that move is. Brightness shows the chance each move
 actually has once the scale, anything learned and **Chaos** are applied, and the digit shows the
-weight you set. Click a cell to cycle its weight. The outlined row is the one being used right now.
+weight you set. Click a cell to cycle its weight, drag on from a click to paint that weight into the cells you cross, and right-click a cell to zero it. The outlined row is the one being used right now.
 
 **Style** replaces the matrix with a ready-made habit: Stepwise (seconds, with some thirds),
 Triadic (thirds and fifths), Fifths (fourths and fifths), Pentatonic, Blues (minor thirds and flat
@@ -74,6 +74,8 @@ line the phrase count starts again with a new random draw. CC 20 (Scene) is not
 
 ### Notes
 
+- Every choice (Scale, Step grid, Order, Learn, Learn channel, Conductor ch and the MIDI output channel) is a drop-down list; the numeric controls are sliders.
+
 - The editor does not move while a CC is driving a control (DPF has no DSP-to-panel path for that);
   the learned counts do update, a few times a second.
 - Only the matrix goes from the editor to the plugin when you edit it, so a melody being learned

docs/pages/assets/plugins/cadence.png

@@ -34,7 +34,8 @@ prose and example chains see `docs/summary.md`; for scale tables see `docs/scale
   chipper, damiano, skream, spliff, helterskelter, treatment, magneto and ghost read those
   by default so Drift needs no configuration. Conductor emits CC 20-24 on channel 16
   (Scene, Density, Energy, Mutation, Reset); bassgen, drumgen, ground, melgen, worms, bubbles,
-  floozy, harmonic-atlas, sprout, lifeform, polymeter and xoxolo listen through a **Conductor Ch**
+  floozy, harmonic-atlas, sprout, lifeform, polymeter, xoxolo, markov, counterpointer
+  and cadence listen through a **Conductor Ch**
   parameter (0 = off). Mixgen drives T-Mix with CC
   20-27 (strips 1-8), Loopdelay with CC 30/31, Lightverb with CC 32/33; CC 19 claims or
   releases the producer bus. Details: `docs/midi-mapping.md`,
@@ -289,11 +290,13 @@ orders. Latch and capture state are internal. Requires transport.
 Transport-aware harmoniser and comping generator that learns harmony from incoming MIDI
 (learned transition model) and emits chord/comping MIDI. No gravity control yet; a
 progression chosen by learned transitions, not a functional-harmony graph. Persistent state.
+**Conductor Ch** (0 = off): CC 21 Complexity, 22 Movement, 23 Variation, CC 24 = 127 relearns.
 
 ### counterpointer
 Learns incoming MIDI and emits a monophonic counter-melody. Counterpoint mode and Bass
 Descend mode; **Inertia** (default 0 = unchanged) is a scoring term in Counterpoint mode
-only. Routing column provides Freeze and channel selectors. Persistent state.
+only. Routing column provides Freeze and channel selectors. Persistent state. **Conductor** (0 = off):
+CC 21 Density, 22 Embellish, 23 Short Rnd, CC 24 = 127 relearns.
 
 ### mnemosyne
 Phrase memory. Stores eight bounded phrases, accompanies incoming MIDI, or generates from

docs/pages/assets/plugins/counterpointer.png

@@ -208,6 +208,23 @@ using ScheduledMidiEvent = MidiMessage;
     return controls;
 }
 
+// Conductor CC set (docs/midi-mapping.md): CC 21 Density -> complexity, 22 Energy -> movement, 23 Mutation -> vary, and
+// CC 24 = 127 (Reset) relearns from the input. CC 20 (Scene) is not used. Returns true when `cc` is one of these.
+[[nodiscard]] inline bool applyConductorCc(Controls& controls, const int cc, const int value) noexcept
+{
+    const int clamped = value < 0 ? 0 : (value > 127 ? 127 : value);
+    const float unit = static_cast<float>(clamped) / 127.0f;
+    switch (cc) {
+    case 21: controls.complexity = unit; return true;
+    case 22: controls.movement = unit; return true;
+    case 23: controls.vary = unit; return true;
+    case 24:
+        if (clamped == 127) ++controls.action_learn;
+        return true;
+    default: return false;
+    }
+}
+
 [[nodiscard]] inline bool harmonyControlsMatch(const Controls& a, const Controls& b) noexcept
 {
     return a.key == b.key &&