white noise: change tempo earlier.

[music/pretentious.git] / 04-white-noise / music / keys.ly

diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index 4b39a05d943b16d20f2764d78fc9f8ad2df7f1ba..04126ba4a5bf47ae24bec20d00246ca96191b76b 100644 (file)
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -35,11 +35,16 @@ keysPad = \relative c' {
   % }
 }
 
+keysThunderRep = \relative c'' {
+  \repeat unfold 3 { a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |}
+}
 keysThunder = \relative c'' {
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
-  d-. d-. d-. d-. d-. d-. d-. d-.            |
+  \keysThunderRep
+  d-. d-. d-. d-. d-. d-. d-. d-. |
+}
+keysThunderB = \relative c'' {
+  \keysThunderRep
+  d-. d-. d-. d ~ d2 |
 }
 
 keysBeauty = \keysIntro
@@ -52,8 +57,11 @@ keysArpeggio = \relative d' {
 }
 
 keysTransition = \relative c' {
-  \time 3/4
-  fis'8. cis d gis, | a8 gis fis r4. |
+  \time 4/4
+  fis'8. cis d gis, a8 gis |
+  \time 2/4
+  \tempo 4 = 160
+  fis r4. |
 }
 
 keysFast = \relative c'' {
@@ -68,34 +76,51 @@ keysFast = \relative c'' {
   <d f gis>2 <cis f gis cis>4 r4 |
 }
 
-keysEleven = \relative c' {
-  \key e \minor
-  \time 11/8
-  \repeat unfold 3 { <e g b dis>4 r4 r4 r4 r4 r8 |}
-  r8 r4 r4 r4 r4 r4
-}
-
-keysElevenTransition = \relative c' {
-  \time 9/8
-  r4. r4. r4.
+%% TODO: play actual chords
+keysToto = \relative c'' {
+  \repeat volta 2 {
+    fis8 fis r4 r4. fis8 | e8 e r4 r2 |
+    fis2.. fis8 | e1 |
+  }
+  \transpose c d {
+    fis8 fis r4 r4. fis8 | e8 e r4 r2 |
+    fis2.. fis8 | e1 |
+  }
+  fis8 fis r4 r4. fis8 | e8 e r4 r2 |
+  fis2.. fis8 | e1 |
 }
 
 keysShifter = \relative c' {
   \key e \minor
   \time 4/4
-  <g e'>4. b'4 <e, b'>4. ~       |
-  <e b'>8 <d b'>4 <d a'>4 d'8 r4 |
-  <g,, e'>4. b'4 <e, b'>4. ~     |
-  \time 7/8
-  <e b'>8 <d b'>4 <d a'>4 d'8 r8 |
+  <g e'>4. b'4 <e, b'>4.         |
+  <d b'>4 <d a'>4 d'8 r4.        |
+  <g,, e'>4. b'4 <e, b'>4.       |
+  \time 2/4
+  <d b'>4 <d a'>4 |
+
+  \key fis \minor
+  \time 4/4
+  <fis a,>4. cis'4 <cis fis,>4.    |
+  <cis e,>4 <b e,>4 e8 r4. |
+  <fis, a,>4. cis'4 <cis fis,>4.    |
+  \time 2/4
+  <cis e,>4 <b e,>4 |
+
+  \key e \minor
+  \time 4/4
+  <g, e'>4. b'4 <e, b'>4.       |
+  <d b'>4 <d a'>4 d'8 r4.       |
+  <g,, e'>4. b'4 <e, b'>4.      |
+  \time 2/4
+  <d b'>4 <d a'>4 |
 
   \key fis \minor
   \time 4/4
-  <fis, a,>4. cis'4 <cis fis,>4. ~    |
-  <cis fis,>8 <cis e,>4 <b e,>4 e8 r4 |
-  <fis, a,>4. cis'4 <cis fis,>4. ~    |
-  \time 7/8
-  <cis fis,>8 <cis e,>4 <b e,>4 e8 r8 |
+  <fis a,>4. cis'4 <cis fis,>4.    |
+  <cis e,>4 <b e,>4 e8 r4. |
+  <fis, a,>4. cis'4 <cis fis,>4.    |
+  <cis e,>4 <b e,>4 ~ <b e,>2 |
 }
 
 keysEnding = \relative c' {
@@ -110,14 +135,6 @@ keysEnding = \relative c' {
   <e gis b>4. a gis4 | <cis, fis a>1 ~ | <cis fis a>1 |
 
   <d fis a>2 <d fis a cis> | <e gis b>1 ~ | <e gis b>1 |
-
-  \tempo 4 = 120
-  <fis, cis fis'>1 ~ | <fis cis fis'> ~ |
-  <fis cis fis'>1 ~ | <fis cis fis'> |
-
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
-  a8 gis16 a8 gis16 a8 gis16 a8 gis16 a8 gis |
 }
 
 keyboard = {
@@ -145,7 +162,7 @@ keyboard = {
   \whiteNoise
   \time 4/4 \keysThunder
   \time 5/4 \repeat volta 2 \keysPad
-  \time 4/4 \keysThunder
+  \time 4/4 \keysThunderB
 
   \time 4/4
   \repeat volta 2 \keysBeauty
@@ -153,11 +170,11 @@ keyboard = {
   \repeat unfold 2 \keysArpeggio
 
   \keysTransition
-  \tempo 4 = 160
   \keysFast
-  \repeat volta 2 \keysEleven
-  \keysElevenTransition
-  \repeat unfold 2 \keysShifter
-  \keysEnding
+  \keysToto
+  \transpose c d {
+    \keysShifter
+    \keysEnding
+  }
 }