gen: retune for the ADSR fix, and the new instruments in the shipped pieces

gen/anthem.gen

@@ -169,7 +169,7 @@ instrument bass {
     a = 1 ms;
     d = 220 ms;
     s = 0.5;
-    r = 60 ms;
+    r = 220 ms;
 };
 
 instrument pad {
@@ -208,7 +208,7 @@ instrument pluck {
     fd = 110 ms;
     d = 240 ms;
     s = 0.1;
-    r = 70 ms;
+    r = 360 ms;
 
     effect "fx/echo.dsp" {
         delay = 341 ms;

gen/boombox.gen

@@ -97,10 +97,9 @@ scale congas "F3 A#3 C4";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 0.9;
+effect "fx/glue.dsp" {
     ceiling = 0.88;
-    smooth  = 1.5;
+    makeup  = 0.3;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -177,7 +176,7 @@ instrument bass {
     a     = 3 ms;
     d     = 300 ms;
     s     = 0.5;
-    r     = 80 ms;
+    r     = 450 ms;
 };
 
 # The carrier. It is heard on its own as well as through the vocoder --

gen/free.gen

@@ -31,7 +31,7 @@ instrument two   { dsp "juno.dsp";    amp = 30; };
 instrument three { dsp "ebass.dsp";   amp = 60; };
 instrument four  { dsp "pluck.dsp";   amp = 28; };
 instrument five  { dsp "ladder.dsp";  amp = 30; };
-instrument six   { dsp "organ0.dsp";  amp = 30; };
+instrument six   { dsp "tonewheel.dsp"; amp = 28; };
 instrument seven { dsp "dxbell.dsp";  amp = 30; };
 instrument eight { dsp "strings.dsp"; amp = 30; };
 

gen/mirrorball.gen

@@ -94,10 +94,9 @@ scale ador "A2 B2 C3 D3 E3 F#3 G3";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.3;
+effect "fx/glue.dsp" {
     ceiling = 0.85;
-    smooth  = 1.5;
+    makeup  = 2.8;
 };
 
 # ---- instruments ------------------------------------------------------

gen/outrun.gen

@@ -99,10 +99,9 @@ scale emin "E2 F#2 G2 A2 B2 C3 D3";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.1;
+effect "fx/glue.dsp" {
     ceiling = 0.88;
-    smooth  = 1.5;
+    makeup  = 3.2;
 };
 
 # ---- instruments ------------------------------------------------------

gen/pearl.gen

@@ -106,10 +106,9 @@ scale amin "A2 B2 C3 D3 E3 F3 G3";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.05;
+effect "fx/glue.dsp" {
     ceiling = 0.88;
-    smooth  = 1.5;
+    makeup  = 2.2;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -118,21 +117,8 @@ effect "fx/limiter.dsp" {
 # to the output, so a chord struck harder is brighter -- which is why
 # the harmonize below tapers its voices rather than the piano's level.
 instrument keys {
-    dsp  "epiano.dsp";
-    amp  = 15;
-
-    body     = 2.4;
-    bodyd    = 1100 ms;
-    tine     = 5;
-    tined    = 220 ms;
-    mix      = 0.45;
-    grit     = 0.22;
-    vib      = 5;
-    vibrate  = 4.5;
-    vibdelay = 400 ms;
-    d        = 2400 ms;
-    s        = 0.2;
-    r        = 300 ms;
+    dsp  "dx5.dsp";
+    amp  = 82;
 };
 
 # The pad, and the chorus its channel sits in. The Juno's own chorus is
@@ -181,7 +167,7 @@ instrument bass {
     a     = 3 ms;
     d     = 380 ms;
     s     = 0.5;
-    r     = 90 ms;
+    r     = 760 ms;
 };
 
 # The kit, on one channel: the note number picks the drum. See

gen/philly.gen

@@ -27,8 +27,9 @@
 # two bars, spelled into triads by the harmonizer with a taper so the
 # top voice leads. They play in the chorus only.
 #
-# THE ORGAN SPINS UP. organ0.dsp is on a channel with fx/rotary.dsp,
-# and the rotor's `speed' is a chanarg, so a gen::steps row the length
+# THE ORGAN SPINS UP. tonewheel.dsp is on a channel with fx/rotary.dsp,
+# the cabinet's valve amp pushed a little, and the rotor's `speed' is a
+# chanarg, so a gen::steps row the length
 # of the arrangement drives it: slow through the verses, fast for each
 # chorus, with the spin-up and the spin-down that the rotary's own
 # slew provides. The row is one value a bar, sixty-four of them,
@@ -90,10 +91,9 @@ scale cmaj "C3 D3 E3 F3 G3 A3 B3";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.25;
+effect "fx/glue.dsp" {
     ceiling = 0.85;
-    smooth  = 1.5;
+    makeup  = 2.5;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -213,19 +213,21 @@ instrument rhodes {
 # The Hammond, and the Leslie its channel plays through. `speed' is
 # driven from the composer side.
 instrument organ {
-    dsp  "organ0.dsp";
-    amp  = 22;
-
-    vmin = 0.3;
-    vmax = 0.6;
-    waveform = 0;
-    a = 4 ms;
-    d = 3 ms;
-    s = 0.5;
-    r = 60 ms;
-    mul1 = 2;
-    mul2 = 3;
-    mul3 = 4;
+    dsp  "tonewheel.dsp";
+    amp  = 17;
+
+    # The old organ's 8', 4', 2 2/3' and 2', as drawbars.
+    db16 = 0;
+    db513 = 0;
+    db8 = 8;
+    db4 = 6;
+    db223 = 6;
+    db2 = 5;
+    db135 = 0;
+    db113 = 0;
+    db1 = 0;
+    click = 0.25;
+    r = 90 ms;
 
     effect "fx/rotary.dsp" {
         speed = 0;
@@ -238,6 +240,7 @@ instrument organ {
         xover = 800;
         trem = 0.4;
         doppler = 1.6 ms;
+        drive = 1;
         mix = 0.8;
     };
 };

gen/riviera.gen

@@ -87,10 +87,9 @@ scale hits  "D4 F4 A4 D5";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.2;
+effect "fx/glue.dsp" {
     ceiling = 0.88;
-    smooth  = 1.5;
+    makeup  = 3.1;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -193,7 +192,7 @@ instrument clav {
     a    = 1 ms;
     d    = 210 ms;
     s    = 0.1;
-    r    = 60 ms;
+    r    = 210 ms;
 };
 
 # One recording of a stab and a brass chord at unison, played at the

gen/seq.gen

@@ -35,7 +35,7 @@ instrument kick  { dsp "kick909.dsp";  amp = 34; };
 instrument snare { dsp "snare808.dsp"; amp = 24; };
 instrument clap  { dsp "clap.dsp";     amp = 30; };
 instrument hat   { dsp "hat808.dsp";   amp = 15; };
-instrument bass  { dsp "fmbass.dsp";   amp = 26; };
+instrument bass  { dsp "fmbass.dsp";   amp = 26; r = 760 ms; };
 instrument pad   { dsp "juno.dsp";     amp = 14; };
 
 # The cells are written the way a click writes them back, with no bar

gen/sunrise.gen

@@ -47,7 +47,8 @@
 # beat ninety-three and repeats every ninety-six beats.
 #
 # The tape echo is on the clap, a dotted eighth with wow on it; the
-# pulse throws into a cleaner one. A limiter holds the sum.
+# pulse throws into a cleaner one. fx/glue.dsp holds the sum: a gentle
+# compressor, a little tape, and a limiter's ceiling last.
 #
 # The shaker's chance, the snare's ratchet and the section's runs roll
 # dice; the seed is pinned for them. Self-contained: open it and press Play.
@@ -107,10 +108,9 @@ scale roots "Bb2 C3 D3 F3 G3";
 
 # ---- the mix ----------------------------------------------------------
 
-effect "fx/limiter.dsp" {
-    drive   = 1.3;
+effect "fx/glue.dsp" {
     ceiling = 0.85;
-    smooth  = 1.5;
+    makeup  = 3.2;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -224,7 +224,7 @@ instrument bass {
     a = 1 ms;
     d = 200 ms;
     s = 0.5;
-    r = 80 ms;
+    r = 400 ms;
 
     # The hand on the knob. `cutoff' is the sweep row's, `res' the walk's.
     effect "fx/filter.dsp" {
@@ -305,6 +305,7 @@ instrument swoop {
 instrument pulse {
     dsp  "pluck.dsp";
     amp  = 12;
+    r    = 390 ms;
 
     effect "fx/echo.dsp" {
         delay = 369 ms;

gen/warehouse.gen

@@ -46,10 +46,10 @@
 # cents apart, through that hall: an effect graph on the channel's sum,
 # so the reverb's tail outlives the chord that fed it.
 #
-# AND THE MIX GOES THROUGH A LIMITER, which is the one effect that
-# cannot live on a channel: a top-level `effect' statement puts
-# fx/limiter.dsp on the sum of every channel, after the mix and before
-# the engine's soft clip. Four channels each under their own ceiling
+# AND THE MIX GOES THROUGH THE GLUE, a mix-bus chain whose last stage is
+# a limiter, the one effect that cannot live on a channel: a top-level
+# `effect' statement puts fx/glue.dsp on the sum of every channel, after
+# the mix and before the engine's soft clip. Four channels each under their own ceiling
 # still add up to whatever they add up to.
 #
 # THE STABS are a sixteen-step ring with rests in the pool -- a step
@@ -115,18 +115,18 @@ scale riff "A1 C2 D2 E2 G2";
 
 # ---- the mix ----------------------------------------------------------
 
-# The last thing in the piece: a limiter on the sum of every channel,
-# after the mix and before the engine's own soft clip. A kick, a bass and
+# The last thing in the piece: the glue on the sum of every channel,
+# after the mix and before the engine's own soft clip -- a slow
+# compressor, tape, and a limiter's ceiling last. A kick, a bass and
 # a pad that all peak on the same downbeat are what a master bus is for,
 # and no per-channel effect can do anything about it -- what is clipping
-# is the sum, and the sum is the one signal no channel can see. `drive'
+# is the sum, and the sum is the one signal no channel can see. `makeup'
 # pushes into the ceiling rather than the ceiling coming down to the
 # signal, which is the difference between a mix that is louder and one
 # that is quieter and duller.
-effect "fx/limiter.dsp" {
-    drive   = 1.4;
+effect "fx/glue.dsp" {
     ceiling = 0.85;
-    smooth  = 1.5;
+    makeup  = 4.3;
 };
 
 # ---- instruments ------------------------------------------------------
@@ -188,7 +188,7 @@ instrument bass {
     a = 2 ms;
     d = 300 ms;
     s = 0.6;
-    r = 80 ms;
+    r = 450 ms;
 
     # And the kick, turning it down. `side' hands this channel's effect
     # the kick channel's audio, so the duck is the kick's own envelope