white noise: Change shifter timing.

4 files changed, 33 insertions, 33 deletions

diff --git a/04-white-noise/music/bass.ly b/04-white-noise/music/bass.ly
index ee228bb..058cec3 100644
--- a/04-white-noise/music/bass.ly
+++ b/04-white-noise/music/bass.ly
@@ -74,34 +74,34 @@ bassElevenTransition = \relative fis,, {
 bassShifter = \relative fis,, {
   \key e \minor
   \time 4/4
-  e1 ~ | e8 d2. dis8 | e1 ~ |
-  \time 7/8
-  e8 d2. |
+  d8 e8*6 e8 | d4-. r2. | d8 e8*6 e8 |
+  \time 3/4
+  d4-. r2 |
 
   \key fis \minor
   \time 4/4
-  fis4 cis8 fis4 a gis8 ~ |
-  gis e r e r e r4        |
-  fis4 cis8 fis4 a gis8 ~ |
-  \time 7/8
-  gis e r e r e r8 |
+  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 |
 
   \key e \minor
   \time 4/4
-  e4 b8 e4 g fis8 ~ |
-  fis d r d8 r8 d r4 |
-  e4 b8 e4 g fis8 ~ |
-  \time 7/8
-  fis8 d r d8 r8 d cis |
+  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 |
 
   \key fis \minor
   \time 4/4
-  fis4 cis8 fis4 a gis8 ~ |
-  gis e r e8 r8 e r4 |
+  fis4 cis8 fis4 a gis8 |
+  e r e8 r8 e r4. |
 
-  fis4 cis8 fis4 a gis8 ~ |
-  \time 7/8
-  gis8 e r e8 r8 e cis |
+  fis4 cis8 fis4 a gis8 |
+  \time 3/4
+  e r e8 r8 e r |
 }
 
 bassEnding = \relative fis,, {
diff --git a/04-white-noise/music/click.ly b/04-white-noise/music/click.ly
index 8dac4f8..7e44d48 100644
--- a/04-white-noise/music/click.ly
+++ b/04-white-noise/music/click.ly
@@ -94,8 +94,8 @@ click = \drummode {
     bd4 hh hh hh |
     bd4 hh hh hh |
     bd4 hh hh hh |
-    \time 7/8
-    bd8 bd bd bd bd bd bd |
+    \time 3/4
+    bd8 bd bd bd bd bd |
   }
 
   %% ending
diff --git a/04-white-noise/music/keys.ly b/04-white-noise/music/keys.ly
index 4b39a05..f2c20d1 100644
--- a/04-white-noise/music/keys.ly
+++ b/04-white-noise/music/keys.ly
@@ -86,16 +86,16 @@ keysShifter = \relative c' {
   <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 |
+  \time 3/4
+  <e b'>8 <d b'>4 <d a'>4 r8 |
 
   \key fis \minor
   \time 4/4
-  <fis, a,>4. cis'4 <cis fis,>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 |
+  \time 3/4
+  <cis fis,>8 <cis e,>4 <b e,>4 r8 |
 }
 
 keysEnding = \relative c' {
diff --git a/04-white-noise/music/stick.ly b/04-white-noise/music/stick.ly
index bd6a84e..6a84412 100644
--- a/04-white-noise/music/stick.ly
+++ b/04-white-noise/music/stick.ly
@@ -150,13 +150,13 @@ stickShifterLeft = \relative c, {
   \time 4/4
   <e e'>1 | r8 <d d'>2. r8 |
   <e e'>1 |
-  \time 7/8
-  r8 <d d'>2. |
+  \time 3/4
+  r8 <d d'>2 r8 |
 
   \time 4/4
   r1 | r1 | r1 |
-  \time 7/8
-  r8*7 |
+  \time 3/4
+  r2. |
 }
 
 %% TODO
@@ -165,15 +165,15 @@ stickShifterRight = \relative c {
   r8 e8 g' e, g' e, g' e,         |
   g' fis e, fis' d, fis'4-. r8    |
   r8 e,8 g' e, g' e, g' e,        |
-  \time 7/8
-  g' fis e, fis' d, fis'4-.       |
+  \time 3/4
+  g' fis e, fis' d, fis'-.        |
 
   \time 4/4
   r8 fis, a' fis, a' fis, a' fis, |
   a' gis e, gis' e, gis'4-. r8    |
   r8 fis, a' fis, a' fis, a' fis, |
-  \time 7/8
-  a' gis e, gis' e, gis'4-.       |
+  \time 3/4
+  a' gis e, gis' e, gis'-.        |
 }