Fix bug with stuck notes when challenge would switch staves.

[scherzo] / score.h

diff --git a/score.h b/score.h
index 1e74b1abbe70ad702f4559a0244d797390b25519..531710348a6a2caad7b1222e622fc8b8d8146cb6 100644 (file)
--- a/score.h
+++ b/score.h
@@ -128,6 +128,7 @@ typedef enum score_duration
 
 typedef struct score_note
 {
+    score_staff_t *staff;
     score_pitch_t pitch;
     int octave;
     score_duration_t duration;
@@ -179,14 +180,14 @@ score_add_staff (score_t *score, score_clef_t clef);
  * QUARTER=4, EIGHTH=8, etc.)
  */
 score_note_t *
-score_staff_add_note (score_staff_t *staff,
-                     score_pitch_t pitch,
-                     int octave,
-                     score_duration_t);
+score_add_note (score_staff_t *staff,
+               score_pitch_t pitch,
+               int octave,
+               score_duration_t);
 
 /* Remove the given note from the given staff. */
 void
-score_staff_remove_note (score_staff_t *staff, score_note_t *note);
+score_remove_note (score_note_t *note);
 
 /* Return the first note on the given staff with the given pitch,
  * octave, and durations. Returns NULL if no match is found. */