white noise: Adjust timing of silence.

6 files changed, 32 insertions, 20 deletions

diff --git a/04-white-noise/04-white-noise.tempo b/04-white-noise/04-white-noise.tempo
index 22a4ce3..9ed540d 100644
--- a/04-white-noise/04-white-noise.tempo
+++ b/04-white-noise/04-white-noise.tempo
@@ -1,12 +1,13 @@
-padding:   32 2/4 120
+#padding:   32 2/4 120
 
 intro:      4 4/4 120
             4 4/4 120 # with bass
 
 main:       8 5/4 120
-            8 5/4 120 # last bar: "white noise"
+            7 5/4 120
+            1 2/4 120 # last bar: "white noise"
 
-silence:    4 5/4 120 # ?
+silence:    4 4/4 120
 
 thunder:    4 4/4 120
 
@@ -22,18 +23,24 @@ transition: 2 3/4 120
 
 fast:       8 4/4 160
 
-eleven:     8 11/8 160
-            1  9/8 160
+eleven:     2 11/8 160 X.x.x.x.x.x
+            1 12/8 160 X.x.x.x.x.x.
+            1 10/8 160 X.x.x.x.x.
+
+            2 11/8 160 X.x.x.x.x.x
+            1 12/8 160 X.x.x.x.x.x.
+            1 10/8 160 X.x.x.x.x.
+            1  9/8 160 X.x.X.x.x
 
 shifter:    3 4/4 160
-            1 7/8 160
+            1 7/8 160 X.x.X.x
             3 4/4 160
-            1 7/8 160
+            1 7/8 160 X.x.X.x
 
             3 4/4 160 # repeat
-            1 7/8 160
+            1 7/8 160 X.x.X.x
             3 4/4 160
-            1 7/8 160
+            1 7/8 160 X.x.X.x
 
 ending:     4 4/4 160
             8 4/4 160
diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly
index 713cf97..8d3023f 100644
--- a/04-white-noise/music/bass.ly
+++ b/04-white-noise/music/bass.ly
@@ -128,8 +128,9 @@ bassMusic = {
     \time 5/4 \repeat volta 2 \bassThemeWithoutEnd
     \alternative {
       { r8 d   r4 d'8 d d, e e r8 | }
-      { r8 d   r4 fis4 ~ fis2     | }
+      { \time 2/4 r8 d r4 | }
     }
+    \time 4/4 fis1
     \whiteNoise
 
     \time 4/4                 \bassThunder
diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index 0f16fe0..183790c 100644
--- a/04-white-noise/music/click.ly
+++ b/04-white-noise/music/click.ly
@@ -15,14 +15,15 @@ click = \drummode {
     bd4 hh hh hh hh |
   } \alternative {
     { hh4 hh hh hh hh | }
-    { hh4 hh hh hh hh | }
+    { \time 2/4 hh4 hh | }
   }
 
-  %% white noise
-  \time 5/4
-  bd4 hh hh hh hh |
-  bd4 hh hh hh hh |
-  bd4 hh hh hh hh |
+  %% white noise (silence)
+  \time 4/4
+  bd4 hh hh hh |
+  bd4 hh hh hh |
+  bd4 hh hh hh |
+  bd4 hh hh hh |
 
   %% Thunder
   \time 4/4
diff --git a/04-white-noise/music/common.ly b/04-white-noise/music/common.ly
index 50b5439..8cd6d21 100644
--- a/04-white-noise/music/common.ly
+++ b/04-white-noise/music/common.ly
@@ -1 +1 @@
-whiteNoise = \repeat unfold 3 { r2. r2 } % TODO: how long?
+whiteNoise = \repeat unfold 3 { r1 }
diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index f60cc24..f8beb9e 100644
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -133,12 +133,13 @@ keyboard = {
       }
     }
     {
+      \time 2/4
       \relative c' {
-        <a d fis>2\repeatTie <cis fis a>2. |  % TODO
+        <a d fis>2\repeatTie |
       }
     }
   }
-
+  \time 4/4 \relative c' {<cis fis a>1}
   \whiteNoise
   \time 4/4 \keysThunder
   \time 5/4 \repeat volta 2 \keysPad
diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index f7e8630..97440cd 100644
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -8,7 +8,7 @@ stickIntro = {
   }
   \alternative {
     {r2. r2 | }
-    {r2. r2 | }
+    {\time 2/4 r2 | }
   }
 }
 
@@ -164,6 +164,7 @@ stickLeft = {
   \key fis \minor
   \clef "bass_8"
   \stickIntro
+  \time 4/4 r1
   \whiteNoise
 
   \time 4/4                 \stickThunderLeft
@@ -182,6 +183,7 @@ stickLeft = {
 stickRight = {
   \key fis \minor
   \stickIntro
+  \time 4/4 r1
   \whiteNoise
 
   \time 4/4                 \stickThunderRight