circus: Update tempo map.

1 files changed, 161 insertions, 157 deletions

diff --git a/03-circus/03-circus.tempo b/03-circus/03-circus.tempo
index 165b64a..3d4fff4 100644
--- a/03-circus/03-circus.tempo
+++ b/03-circus/03-circus.tempo
@@ -1,177 +1,181 @@
-count-in:   4 2/4 120
+padding:    4 1/4 120
+
+count-in:   1 8/8 120 x.x.x.xX
 
 # Diminished chord starts on "4 and".
 # The key is C# minor
 
-slow:      24 2/4 120
-            4 2/4 120
-
-solo:       3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-            
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
+slow:       2 16/8 120  xxxXxXxXxXxXxxxX
+            1 12/8 120  xXxXxXxXxXxX
+            1  4/8 120  x.x.
+
+            1 16/8 120  xXxXxXxXxXxXxxxX
+            1 16/8 120  xxxXxXxXxXxXxxxX
+            1 12/8 120  xXxXxXxXxXxX
+            4  4/8 120  xXxX
+
+solo:       3 2/4 150 xX
+            1 3/4 150 xXx
+            3 2/4 150 xX
+            1 4/4 150 xXxX
+
+            3 2/4 150 xX
+            1 3/4 150 xXx
+            3 2/4 150 xX
+            1 4/4 150 xXxX
 
 # Key change to F# minor
 
-spooky:     3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-            
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
+spooky:     3 2/4 150 xX
+            1 3/4 150 xXx
+            3 2/4 150 xX
+            1 4/4 150 xXxX
+
+            3 2/4 150 xX
+            1 3/4 150 xXx
+            3 2/4 150 xX
+            1 4/4 150 xXxX
 
 # Key change to B minor
 # The drums play half time feel.
 
-keyboard:   3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-weird:      2 2/4 160
-            1 2/8 160
-            1 2/4 160
-            1 5/8 160
-            1 2/4 160
-            1 5/8 160
-
-            2 2/4 160
-            1 2/8 160
-            1 2/4 160
-            1 5/8 160
-            1 2/4 160
-            1 5/8 160
-
-ballet:     1 3/4 160
-            1 2/4 160
-            1 3/4 160
-            1 2/4 160
-            1 3/4 160
-            1 2/4 160
-            1 1/4 160
+keyboard:   3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+weird:      2 2/4 150
+            1 2/8 150
+            1 2/4 150
+            1 5/8 150
+            1 2/4 150
+            1 5/8 150
+
+            2 2/4 150
+            1 2/8 150
+            1 2/4 150
+            1 5/8 150
+            1 2/4 150
+            1 5/8 150
+
+ballet:     1 3/4 150
+            1 2/4 150
+            1 3/4 150
+            1 2/4 150
+            1 3/4 150
+            1 2/4 150
+            1 1/4 150
 
 # Repeat the previous section
 
-keyboard:   3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-            3 2/4 160
-            1 1/4 160
-            1 4/8 160
-            3 2/4 160
-            1 8/8 160
-
-weird:      2 2/4 160
-            1 2/8 160
-            1 2/4 160
-            1 5/8 160
-            1 2/4 160
-            1 5/8 160
-
-            2 2/4 160
-            1 2/8 160
-            1 2/4 160
-            1 5/8 160
-            1 2/4 160
-            1 5/8 160
-
-ballet:     1 3/4 160
-            1 2/4 160
-            1 3/4 160
-            1 2/4 160
-            1 3/4 160
-            1 2/4 160
-            1 1/4 160
+keyboard:   3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+            3 2/4 150
+            1 1/4 150
+            1 4/8 150
+            3 2/4 150
+            1 8/8 150
+
+weird:      2 2/4 150
+            1 2/8 150
+            1 2/4 150
+            1 5/8 150
+            1 2/4 150
+            1 5/8 150
+
+            2 2/4 150
+            1 2/8 150
+            1 2/4 150
+            1 5/8 150
+            1 2/4 150
+            1 5/8 150
+
+ballet:     1 3/4 150
+            1 2/4 150
+            1 3/4 150
+            1 2/4 150
+            1 3/4 150
+            1 2/4 150
+            1 1/4 150
 
 
 # Not sure about the arrangement here:
 
-beautiful:  1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-
-            1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-            1 6/8 160
-
-repeat1:    1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-
-            1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-            1 6/8 160
-
-repeat2:    1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-
-            1 4/4 160
-            1 3/4 160
-            1 4/4 160
-            1 3/4 160
-            1 6/8 160
-
-final:      3 4/4 160
-            1 7/8 160
-
-            3 4/4 160
-            1 7/8 160
-
-            3 4/4 160
-            1 7/8 160
+beautiful:  1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+
+            1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+            1 6/8 150
+
+repeat1:    1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+
+            1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+            1 6/8 150
+
+repeat2:    1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+
+            1 4/4 150
+            1 3/4 150
+            1 4/4 150
+            1 3/4 150
+            1 6/8 150
+
+final:      3 4/4 150
+            1 7/8 150
+
+            3 4/4 150
+            1 7/8 150
+
+            3 4/4 150
+            1 7/8 150
 
 # TODO: the ending hasn't been written yet!