white-noise: Drop repetition of main theme.

diff --git a/04-white-noise/parts/bass.ly b/04-white-noise/parts/bass.ly
index a305f243945f89841d4df273f8197a38e854ca48..dbf9194c08473b2107f0ab12dab39a79887ee78a 100644 (file)
--- a/04-white-noise/parts/bass.ly
+++ b/04-white-noise/parts/bass.ly
@@ -55,7 +55,6 @@ bass = {
     \time 5/4 \repeat volta 2 \bassTheme
     \time 4/4                 \bassThunder
 
     \time 5/4 \repeat volta 2 \bassTheme
     \time 4/4                 \bassThunder
 

-    \time 5/4 \repeat volta 2 \bassTheme

     \time 4/4 \repeat volta 2 \bassBeautyB
 
     \repeat unfold 2 \bassSolo
     \time 4/4 \repeat volta 2 \bassBeautyB
 
     \repeat unfold 2 \bassSolo

diff --git a/04-white-noise/parts/click.ly b/04-white-noise/parts/click.ly
index a6acc3abf1a5cfe324eb76ab5277ee70af3f36ea..cdf3da4f6cf55af40e59c66d3987d5843aff726d 100644 (file)
--- a/04-white-noise/parts/click.ly
+++ b/04-white-noise/parts/click.ly
@@ -44,15 +44,6 @@ click = \drummode {
   bd4 hh hh hh | bd hh hh hh |
   bd4 hh hh hh | bd hh hh hh |
 
   bd4 hh hh hh | bd hh hh hh |
   bd4 hh hh hh | bd hh hh hh |
 

-  %% Main theme
-  \time 5/4
-  \repeat volta 2 {
-    bd4 hh hh hh hh | hh4 hh hh hh hh |
-    bd4 hh hh hh hh | hh4 hh hh hh hh |
-    bd4 hh hh hh hh | hh4 hh hh hh hh |
-    bd4 hh hh hh hh | hh4 hh hh hh hh |
-  }
-

   %% Beauty
   \time 4/4
   \repeat volta 2 {
   %% Beauty
   \time 4/4
   \repeat volta 2 {

diff --git a/04-white-noise/parts/keys.ly b/04-white-noise/parts/keys.ly
index 1b8a5a146d7b64ee8a72d9173c6067fa3dbe286f..718c99ec8075fdbbbec0ac1deb56e613b6002bb2 100644 (file)
--- a/04-white-noise/parts/keys.ly
+++ b/04-white-noise/parts/keys.ly
@@ -74,7 +74,6 @@ keyboard = {
   \time 4/4 \keysThunder
   \time 5/4 \repeat volta 2 \keysPad
   \time 4/4 \keysThunder
   \time 4/4 \keysThunder
   \time 5/4 \repeat volta 2 \keysPad
   \time 4/4 \keysThunder

-  \time 5/4 \repeat volta 2 \keysPad

 
   \time 4/4
   \repeat volta 2 \keysIntro
 
   \time 4/4
   \repeat volta 2 \keysIntro

diff --git a/04-white-noise/parts/stick.ly b/04-white-noise/parts/stick.ly
index d5b2a14edc8fc4462f2d0805019a3b23d887ff9e..6f47f3490603fedfacbdd906f5d2bd878ae23998 100644 (file)
--- a/04-white-noise/parts/stick.ly
+++ b/04-white-noise/parts/stick.ly
@@ -49,10 +49,9 @@ stickLeft = {
   \stickIntro
   \whiteNoise
 
   \stickIntro
   \whiteNoise
 

-  \stickThunderLeft
-  \repeat volta 2 \stickThemeLeft
-  \stickThunderLeft
-  \repeat volta 2 \stickThemeLeft
+  \time 4/4                 \stickThunderLeft
+  \time 5/4 \repeat volta 2 \stickThemeLeft
+  \time 4/4                 \stickThunderLeft

 }
 
 stickRight = {
 }
 
 stickRight = {


@@ -60,10 +59,9 @@ stickRight = {
   \stickIntro
   \whiteNoise
 
   \stickIntro
   \whiteNoise
 

-  \stickThunderRight
-  \repeat volta 2 \stickThemeRight
-  \stickThunderRight
-  \repeat volta 2 \stickThemeRight
+  \time 4/4                 \stickThunderRight
+  \time 5/4 \repeat volta 2 \stickThemeRight
+  \time 4/4                 \stickThunderRight

 
   %% TODO: this is terrible and I would never play this
   \repeat volta 2 \relative c' {
 
   %% TODO: this is terrible and I would never play this
   \repeat volta 2 \relative c' {