white noise: Fix shifter.

diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly
index 8920601..ba02bd1 100644 (file)
--- a/04-white-noise/music/bass.ly
+++ b/04-white-noise/music/bass.ly
@@ -63,24 +63,24 @@ bassShifter = \relative fis,, {
   \key e \minor
   \time 4/4
   d8 e8*6 e8 | d4-. r2. | d8 e8*6 e8 |
-  \time 3/4
-  d4-. r2 |
+  \time 2/4
+  d4-. r4 |
 
   \key fis \minor
   \time 4/4
   fis4 cis8 fis4 a gis8 |
   e r e r e r4.         |
   fis4 cis8 fis4 a gis8 |
-  \time 3/4
-  e r e r e r |
+  \time 2/4
+  e r e r |
 
   \key e \minor
   \time 4/4
   e4 b8 e4 g fis8 |
   d r d8 r8 d r4. |
   e4 b8 e4 g fis8 |
-  \time 3/4
-  d r d8 r8 d r |
+  \time 2/4
+  d r d8 r8 |
 
   \key fis \minor
   \time 4/4
@@ -88,8 +88,8 @@ bassShifter = \relative fis,, {
   e r e8 r8 e r4. |
 
   fis4 cis8 fis4 a gis8 |
-  \time 3/4
-  e r e8 r8 e r |
+  \time 2/4
+  e r e8 r8 |
 }
 
 bassEnding = \relative fis,, {

diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index 121acda..89e2c93 100644 (file)
--- a/04-white-noise/music/click.ly
+++ b/04-white-noise/music/click.ly
@@ -84,8 +84,8 @@ click = \drummode {
     bd4 hh hh hh |
     bd4 hh hh hh |
     bd4 hh hh hh |
-    \time 3/4
-    bd8 bd bd bd bd bd |
+    \time 2/4
+    bd4 bd4 |
   }
 
   %% ending

diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index 4206234..03b3088 100644 (file)
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -71,19 +71,19 @@ keysFast = \relative c'' {
 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 3/4
-  <e b'>8 <d b'>4 <d a'>4 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 fis,>8 <cis e,>4 <b e,>4 e8 r4 |
-  <fis, a,>4. cis'4 <cis fis,>4. ~    |
-  \time 3/4
-  <cis fis,>8 <cis e,>4 <b e,>4 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.    |
+  \time 2/4
+  <cis e,>4 <b e,>4 |
 }
 
 keysEnding = \relative c' {

diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index e6fb885..be1a301 100644 (file)
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -118,26 +118,26 @@ stickFastRight = \relative fis {
 
 stickShifterLeft = \relative c {
   \time 4/4
-  r8\mp e8 g' e, g' e, g' e, |
-  <e g'> <d fis'> r <d fis'> r <d fis'>4-. r8 |
-  r8 e8 g' e, g' e, g' e, |
-  \time 3/4
-  <e g'> <d fis'> r <d fis'> r4 |
+  e8\mp g' e, g' e, g' e, <e g'> |
+  <d fis'> r <d fis'> r <d fis'> r4. |
+  e8 g' e, g' e, g' e, <e g'> |
+  \time 2/4
+  <d fis'> r <d fis'> r |
 
   \time 4/4
-  r8 fis a' fis, a' fis, a' fis, |
-  <fis a'> <e gis'> r <e gis'> r <e gis'>4-. r8 |
-  r8 fis a' fis, a' fis, a' fis, |
-  \time 3/4
-  <fis a'> <e gis'> r <e gis'> r4 |
+  fis8 a' fis, a' fis, a' fis, <fis a'> |
+  <e gis'> r <e gis'> r <e gis'> r4.   |
+  fis8 a' fis, a' fis, a' fis, <fis a'> |
+  \time 2/4
+  <e gis'> r <e gis'> r |
 }
 
 %% TODO
 stickShifterRight = \relative c {
   \time 4/4 R1*3
-  \time 3/4 R4*3
+  \time 2/4 R4*2
   \time 4/4 R1*3
-  \time 3/4 R4*3
+  \time 2/4 R4*2
 }