summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-04-26 22:46:10 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-04-26 22:46:10 +0200
commitcfd0af625076a12b6a6195b38db321d97bd4a444 (patch)
tree52eb6ed4f2c9a4dad73adcb46a71a4d6583f33f8
parent72ce94a8c48d354e3c8dca57ec57050a5dbfd710 (diff)
circus: Move all tempo markers to click.
-rw-r--r--03-circus/music/bass.ly1
-rw-r--r--03-circus/music/click.ly5
-rw-r--r--03-circus/music/stick.ly1
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