summaryrefslogtreecommitdiff
path: root/01-song1
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2016-11-11 19:30:09 +0100
committerrekado <rekado@elephly.net>2016-11-15 10:47:18 +0100
commit00b8024894a70b1e080b80e54d9ddc2caf650d37 (patch)
tree1221894c21627897314b0665d64519eabca56259 /01-song1
parent31ba2398b98a1bf45837c855a08869c45f94aee8 (diff)
song1: adjust tempo
Diffstat (limited to '01-song1')
-rw-r--r--01-song1/01-song1.tempo88
-rw-r--r--01-song1/music/bass.ly2
-rw-r--r--01-song1/music/click.ly10
-rw-r--r--01-song1/music/keys.ly2
-rw-r--r--01-song1/music/stick.ly6
5 files changed, 58 insertions, 50 deletions
diff --git a/01-song1/01-song1.tempo b/01-song1/01-song1.tempo
index 7052ef2..82b8036 100644
--- a/01-song1/01-song1.tempo
+++ b/01-song1/01-song1.tempo
@@ -1,42 +1,44 @@
-padding: 32 4/4 180
-intro: 16 4/4 180
+padding: 32 4/4 185
+intro: 16 4/4 185
-a1: 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+a1: 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 2 4/4 185
-a1b: 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+a1b: 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 2 4/4 185
-a-extend1: 2 4/4 180
- 6 4/4 180
- 4 4/4 180
+a-extend1: 2 4/4 185
+ 6 4/4 185
+ 1 4/4 180
-verse1: 12 4/4 175
-verse2: 12 4/4 175
+verse0: 12 4/4 180
+verse1: 12 4/4 180
+verse2: 12 4/4 180
# key change
-verse3: 12 4/4 175
+verse3: 12 4/4 185
# key change back
-verse4: 12 4/4 175
+verse4: 12 4/4 185
-a2: 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+a2: 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 2 4/4 185
-a2b: 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+a2b: 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 2 4/4 185
-a-extend2: 2 4/4 180
- 6 4/4 180
- 4 4/4 180
+a-extend2: 2 4/4 185
+ 4 4/4 185
+ # TODO: ramp up before!
+ 6 4/4 195
pause: 4 12/8 185 X..x..x..x..
@@ -55,22 +57,24 @@ waltz: 15 3/4 180
3 3/4 180
2 4/4 180
-b: 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+b: 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 2 4/4 185
- 5 2/4 180
- 1 3/4 180
- 3 2/4 180
- 2 4/4 180
+ 5 2/4 185
+ 1 3/4 185
+ 3 2/4 185
+ 8 4/4 185
-b-trans: 2 4/4 180
+# TODO: tempo ramp?
+b-trans: 3 4/4 195
+ 1 4/4 195 X...
-outro: 4 4/4 180
- 4 4/4 180
+outro: 4 4/4 195
+ 4 4/4 195
- 4 4/4 180
- 4 4/4 180
+ 4 4/4 195
+ 4 4/4 195
-end: 6 4/4 180
+end: 6 4/4 195
diff --git a/01-song1/music/bass.ly b/01-song1/music/bass.ly
index 472592b..0e526fc 100644
--- a/01-song1/music/bass.ly
+++ b/01-song1/music/bass.ly
@@ -37,7 +37,7 @@ bassAExtended = \relative fis,, {
bassATransition = \relative fis,, {
\time 4/4
- e4. fis4 gis8 a4 ~ | a1 ~ | a1 ~ | a |
+ e4. fis4 gis8 a4 ~ | a1 ~ | a1 |
}
bassATransitionVariant = \relative fis,, {
diff --git a/01-song1/music/click.ly b/01-song1/music/click.ly
index 4d65f66..b20ff20 100644
--- a/01-song1/music/click.ly
+++ b/01-song1/music/click.ly
@@ -1,5 +1,5 @@
click = \drummode {
- \tempo 4 = 180
+ \tempo 4 = 185
\time 4/4
%% intro
@@ -22,6 +22,7 @@ click = \drummode {
<bd hh>8 r4 sn4 sn r8 | hh4 hh hh hh |
%% A
+ \tempo 4 = 185
\repeat volta 2 {
\time 2/4 \repeat unfold 5 { bd4 hh }
\time 6/8 { <bd hh>8 hh hh hh hh hh }
@@ -38,22 +39,22 @@ click = \drummode {
%% A transition
\time 4/4
<cymc bd hh>4 hh hh hh | <bd hh> hh hh hh |
- <bd hh> hh hh hh | <bd hh> hh hh hh |
+ \tempo 4 = 180
+ <bd hh> hh hh hh |
%% Verse
- \tempo 4 = 175
\repeat volta 3 {
\time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
}
%% Key-change verse
+ \tempo 4 = 185
\time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
%% verse harder
\time 4/4 \repeat unfold 12 { <bd hh>2 hh | }
%% A
- \tempo 4 = 180
\repeat volta 2 {
\time 2/4 \repeat unfold 5 { bd4 hh }
\time 6/8 { <bd hh>8 hh hh hh hh hh }
@@ -68,6 +69,7 @@ click = \drummode {
}
%% A transition variant
+ \tempo 4 = 195
\time 4/4 \repeat unfold 4 { <sn hh>4 <sn hh> <sn hh> <sn hh> | }
\time 4/4
<bd hh>8 bd bd <bd hh> bd bd bd bd | r bd hh4 hh hh |
diff --git a/01-song1/music/keys.ly b/01-song1/music/keys.ly
index a668e3c..c991085 100644
--- a/01-song1/music/keys.ly
+++ b/01-song1/music/keys.ly
@@ -27,7 +27,7 @@ keysAExtended = \relative c' {
keysATransition = \relative c' {
\time 4/4
gis'8 e b dis e b <a cis e>4\arpeggio ~ | <a cis e>1 ~ |
- <a cis e> ~ | <a cis e> |
+ <a cis e> |
}
keysATransitionVariant = \relative c' {
diff --git a/01-song1/music/stick.ly b/01-song1/music/stick.ly
index 519977a..625a613 100644
--- a/01-song1/music/stick.ly
+++ b/01-song1/music/stick.ly
@@ -90,11 +90,11 @@ stickAExtendedRight = \relative c' {
}
stickATransitionLeft = \relative c {
- \time 4/4 r1 | r1 | r1 | r1 |
+ \time 4/4 r1 | r1 | r1 |
}
stickATransitionRight = \relative c' {
b'8 gis e fis gis e <e a cis>4\arpeggio ~ | <e a cis>1 ~
- \time 4/4 <e a cis>1 ~ | <e a cis> |
+ \time 4/4 <e a cis>1 |
}
stickATransitionVariantLeft = \relative c {
@@ -113,6 +113,7 @@ stickATransitionVariantPreOutroLeft = \relative c {
}
stickATransitionVariantPreOutroRight = \relative c' {
+ \tempo 4 = 195
\time 4/4 \repeat unfold 3 {
cis8-2 gis-1 e-3 e' c4-.-1 cis4-.-2
}
@@ -328,6 +329,7 @@ stick = <<
\stickNastyRight
\stickWaltzRight
+ \tempo 4 = 185
\repeat volta 2 \stickARight
\stickAExtendedRight
\stickATransitionVariantPreOutroRight