diff --git a/pop/sailor-song/bin/bells.sh b/pop/sailor-song/bin/bells.sh index a44245e82a..b3ee4bdaea 100755 --- a/pop/sailor-song/bin/bells.sh +++ b/pop/sailor-song/bin/bells.sh @@ -11,7 +11,7 @@ BELL="$LANE/../bell/c/bell" DIR="$LANE/src/bells" mkdir -p "$DIR" [ -x "$BELL" ] || (cd "$LANE/../bell/c" && bash build.sh) -for m in 63 64 66 68 70 71 73 75 76; do +for m in 63 64 66 68 70 71 73 75 76 78 80 82 83 85 87 88; do # v116: a second octave — "the bells after the last long are too low, they drag it around" out="$DIR/bell-$m.wav" [ -f "$out" ] && continue hz=$(awk -v m="$m" 'BEGIN{printf "%.3f", 440*2^((m+0.13-69)/12)}') diff --git a/pop/sailor-song/c/sailorremix.c b/pop/sailor-song/c/sailorremix.c index 7a192efeb1..fc8952d543 100644 --- a/pop/sailor-song/c/sailorremix.c +++ b/pop/sailor-song/c/sailorremix.c @@ -90,7 +90,7 @@ #include "sailor-chart.h" #define SR 48000 -#define VERSION "v115" +#define VERSION "v116" #define EAGER 0.009 // v73: "eager" placement — percussion pushes ~9 ms ahead of the grid #define PIANO_ON 1 // v112: ON — "I wanted the piano" (v71 had turned it off) #define SHIFT27 0.0 // v53: how much earlier everything after bar 27 plays, now that the regularizer fits it to four beats @@ -333,7 +333,7 @@ static void gong_deep(double t, int midi, double g, double vibHz, double vibCent ev(t, "gong", 8.0, g, midi); } static void fem_bell(double t, int midi, double g) { - while (midi > 76) midi -= 12; + while (midi > 88) midi -= 12; // v116: the bank now runs E4–E6 (was E4–E5, the loner rule) — the break's bells were asked at 72–83 and folded an octave down while (midi < 63) midi += 12; if (!BELLS[midi].L) { char p[256]; snprintf(p, sizeof p, LANE "/src/bells/bell-%d.wav", midi);