white noise: bass: clean up solo section.

1 files changed, 10 insertions, 11 deletions

diff --git a/04-white-noise/parts/bass.ly b/04-white-noise/parts/bass.ly
index 975fd92..a305f24 100644
--- a/04-white-noise/parts/bass.ly
+++ b/04-white-noise/parts/bass.ly
@@ -27,6 +27,14 @@ bassThunder = \relative fis,, {
   d-. d-. d-. d-. d-. d-. d-. d-.            |
 }
 
+%% Note: not "bass solo", but "bass" while "solo".
+bassSolo = \relative fis,, {
+  d2 r8 e4.      | fis2. r4          |
+  d2 e           | fis  r8 gis a cis |
+  d2 r8 e4 b8    | cis2. r4          |
+  b2 r8 cis4 e,8 | fis1              |
+}
+
 bass = {
   \set Staff.midiInstrument = #"electric bass (finger)"
   \clef "bass_8"
@@ -50,21 +58,12 @@ bass = {
     \time 5/4 \repeat volta 2 \bassTheme
     \time 4/4 \repeat volta 2 \bassBeautyB
 
+    \repeat unfold 2 \bassSolo
+
     %% TODO
-    %% solo
     %% sweet and quiet
     %% solo
 
-    %% april?
-    \relative fis,, {
-      d2 r8 e4. | fis2. r4 |
-      d2 e fis  r8 gis a cis
-      d2 r8 e4 b8 cis2. r4 b2
-
-      r8 cis4 e,8 fis1
-      d2 r8 e4. fis2. r4 fis8 e r4 e2 fis r8 gis a cis d2 r8 e4 b8 cis2. r4 b2 r8 cis4 e,8 fis1 fis8 r8*5
-    }
-
     %{
     %% fast and weird
     fis8 e fis a4 gis8 fis e