From cfd0af625076a12b6a6195b38db321d97bd4a444 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Wed, 26 Apr 2017 22:46:10 +0200
Subject: circus: Move all tempo markers to click.

---
 03-circus/music/bass.ly  | 1 -
 03-circus/music/click.ly | 5 +++++
 03-circus/music/stick.ly | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/03-circus/music/bass.ly b/03-circus/music/bass.ly
index cb87df3..c7020c2 100644
--- a/03-circus/music/bass.ly
+++ b/03-circus/music/bass.ly
@@ -191,7 +191,6 @@ bassMusic = {
   }
 
   %% Solo
-  \tempo 4 = 150
   \bassB \bassB
 
   %% Spooky
diff --git a/03-circus/music/click.ly b/03-circus/music/click.ly
index 0ba3a0d..8c19ef1 100644
--- a/03-circus/music/click.ly
+++ b/03-circus/music/click.ly
@@ -19,6 +19,7 @@ click = \drummode {
   }
 
   %% solo
+  \tempo 4 = 150
   \repeat unfold 2 {
     \time 2/4
     <cymc hh>4 hh | hh hh | hh hh |
@@ -68,4 +69,8 @@ click = \drummode {
     \time 5/4 { hh4 hh hh hh hh | hh4 hh hh hh hh |}
     \time 3/4 { hh4 hh hh | hh hh hh |}
   }
+
+  \time 4/4
+  #(mmrest-of-length (unfoldRepeats stickBeautyRight))
+  \tempo 4 = 180
 }
diff --git a/03-circus/music/stick.ly b/03-circus/music/stick.ly
index 077c787..f4855ff 100644
--- a/03-circus/music/stick.ly
+++ b/03-circus/music/stick.ly
@@ -388,7 +388,6 @@ stick = <<
     \stickBeautyRight
 
     %% Arpeggio
-    \tempo 4 = 180
     \key e \minor
     \mark \default
     \stickBeforeArpeggioRight
-- 
cgit v1.2.3