white noise: Adjust timing of silence.

diff --git a/04-white-noise/04-white-noise.tempo b/04-white-noise/04-white-noise.tempo
index 22a4ce3b0fe8d4aefce008f0ee8229cb28856c93..9ed540d048508f7e7e992973ccc3654e5b7241be 100644 (file)
--- 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
 
 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
 
 
 thunder:    4 4/4 120
 


@@ -22,18 +23,24 @@ transition: 2 3/4 120
 
 fast:       8 4/4 160
 
 
 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
 
 shifter:    3 4/4 160

-            1 7/8 160
+            1 7/8 160 X.x.X.x

             3 4/4 160
             3 4/4 160

-            1 7/8 160
+            1 7/8 160 X.x.X.x

 
             3 4/4 160 # repeat
 
             3 4/4 160 # repeat

-            1 7/8 160
+            1 7/8 160 X.x.X.x

             3 4/4 160
             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
 
 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 713cf97f41ff52d127eea5ec42ec08f0535a8740..8d3023f41467c2a60f85db5eb740c2ab7fac21fc 100644 (file)
--- 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 | }
     \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
     \whiteNoise
 
     \time 4/4                 \bassThunder

diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index 0f16fe0a221e03b02528d7a9c7e62b6027dad1f5..183790c518ced46d4bdde295d8377b28901e4a63 100644 (file)
--- 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 | }
     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
 
   %% Thunder
   \time 4/4

diff --git a/04-white-noise/music/common.ly b/04-white-noise/music/common.ly
index 50b543924ce741dd89294cd75348fffe79594911..8cd6d21facb9d13e0b188f9e1b2b7b0f42607ded 100644 (file)
--- 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 f60cc2466fae4d2500b95eb0529bdded03a19856..f8beb9e24a7e07328d6f5efad782d59dbe83a4fa 100644 (file)
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -133,12 +133,13 @@ keyboard = {
       }
     }
     {
       }
     }
     {

+      \time 2/4

       \relative c' {
       \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
   \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 f7e86309a5bb9efecc5ab96dfbf12f4882c50835..97440cdc97f6c04b987ccfdb63b9f40626233b75 100644 (file)
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -8,7 +8,7 @@ stickIntro = {
   }
   \alternative {
     {r2. r2 | }
   }
   \alternative {
     {r2. r2 | }

-    {r2. r2 | }
+    {\time 2/4 r2 | }

   }
 }
 
   }
 }
 


@@ -164,6 +164,7 @@ stickLeft = {
   \key fis \minor
   \clef "bass_8"
   \stickIntro
   \key fis \minor
   \clef "bass_8"
   \stickIntro

+  \time 4/4 r1

   \whiteNoise
 
   \time 4/4                 \stickThunderLeft
   \whiteNoise
 
   \time 4/4                 \stickThunderLeft


@@ -182,6 +183,7 @@ stickLeft = {
 stickRight = {
   \key fis \minor
   \stickIntro
 stickRight = {
   \key fis \minor
   \stickIntro

+  \time 4/4 r1

   \whiteNoise
 
   \time 4/4                 \stickThunderRight
   \whiteNoise
 
   \time 4/4                 \stickThunderRight