Fix scherzo to use pitch_t rather than score_note_t for computation

[scherzo] / score.h

diff --git a/score.h b/score.h
index 5dd61887d340da2bbb5ca5420af8dc23bd968bc4..b8791f67f1caa5f8dd0ab9257efa9997d312fb46 100644 (file)
--- a/score.h
+++ b/score.h
@@ -55,7 +55,6 @@ typedef struct score_note
 {
     score_staff_t *staff;
     pitch_t pitch;
-    int octave;
     score_duration_t duration;
 
     struct {
@@ -109,20 +108,21 @@ score_add_brace (score_t *score, int staves);
 score_staff_t *
 score_add_staff (score_t *score, score_clef_t clef);
 
-/* Add a note to a staff of the given pitch, octave, and duration.
- *
- * Octave numbers are ISO octave numbers [0:8], (so Octave 4 is from
- * middle C to the B above middle C).
+/* Add a note to a staff of the given pitch and duration.
  *
  * Duration values can be symbolic (SCORE_DURATION_WHOLE, _QUARTER,
  * _EIGHTH, etc.) or numerical as simply the denominator (WHOLE=1,
  * QUARTER=4, EIGHTH=8, etc.)
  */
 score_note_t *
-score_add_note (score_staff_t *staff,
-               pitch_t pitch,
-               int octave,
-               score_duration_t);
+score_staff_add_note (score_staff_t *staff,
+                     pitch_t pitch,
+                     score_duration_t duration);
+
+/* Add a note to the score, (automatically selecting the nearest
+ * staff) */
+score_note_t *
+score_add_note (score_t *score, pitch_t pitch, score_duration_t duration);
 
 /* Add a chord symbol of 'name' to a staff.
  *
@@ -143,6 +143,14 @@ score_remove_chord (score_chord_t *chord);
 void
 score_remove_note (score_note_t *note);
 
+/* Remove all notes from the given staff. */
+void
+score_staff_remove_notes (score_staff_t *staff);
+
+/* Remove all notes from the score. */
+void
+score_remove_notes (score_t *score);
+
 void
 score_set_note_color_rgb (score_note_t *note,
                          double r,
@@ -154,7 +162,6 @@ score_set_note_color_rgb (score_note_t *note,
 score_note_t *
 score_staff_find_note (score_staff_t *staff,
                       pitch_t pitch,
-                      int octave,
                       score_duration_t duration);
 
 /* Draw the given score_t onto the given cairo_t.