From dd714c0284f6c61d2a802f2626463524b75a1933 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 3 Oct 2013 10:47:11 -0700 Subject: [PATCH] Respell a note if it triggers a key change. It looks a bit odd to play a G-major scale, see the G-major key signature pop up, but see a G-flat on the staff at the end of the scale instead of the expected F-sharp. Fix this by respelling the note when the key signature changes. --- scherzo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scherzo.c b/scherzo.c index 0ef44ea..7288d5f 100644 --- a/scherzo.c +++ b/scherzo.c @@ -999,9 +999,13 @@ scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) (NUM_RECENT_PITCHES - 1) * sizeof (pitch_t)); recent_pitches[NUM_RECENT_PITCHES - 1] = pitch; - if (pitches_are_diatonic_scale (recent_pitches, NUM_RECENT_PITCHES)) + if (pitches_are_diatonic_scale (recent_pitches, NUM_RECENT_PITCHES)) { scherzo_set_key (scherzo, recent_pitches[0]); + /* Respell pitch according to new key. */ + pitch = scherzo_key_spell_pitch (&scherzo->key, pitch); + } + /* Do nothing if this note is already pressed. */ for (i = 0; i < scherzo->notes_pressed.num_pitches; i++) if (scherzo->notes_pressed.pitches[i] == pitch) -- 2.43.0