Encode octave within pitch_t value

[scherzo] / score.h

diff --git a/score.h b/score.h
index 5dd61887d340da2bbb5ca5420af8dc23bd968bc4..d5391012bb428e26f901a8432535ce797f3c8700 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,10 +108,7 @@ 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,
@@ -121,7 +117,6 @@ score_add_staff (score_t *score, score_clef_t clef);
 score_note_t *
 score_add_note (score_staff_t *staff,
                pitch_t pitch,
-               int octave,
                score_duration_t);
 
 /* Add a chord symbol of 'name' to a staff.
@@ -154,7 +149,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.