Encode octave within pitch_t value

[scherzo] / score.c

diff --git a/score.c b/score.c
index e047f979b6f77d2ba36f2146cbe74cf8f38fcc06..0c868c6f4a255b93787533db9cb6a80a6ff85919 100644 (file)
--- a/score.c
+++ b/score.c
@@ -177,10 +177,11 @@ _score_clef_c_line (score_clef_t clef)
 static double
 _score_note_to_line (score_staff_t *staff, score_note_t *note)
 {
-    score_pitch_name_t name = SCORE_PITCH_NAME (note->pitch);
+    pitch_name_t name = PITCH_NAME (note->pitch);
+    int octave = PITCH_OCTAVE (note->pitch);
     int c_line = _score_clef_c_line (staff->clef);
 
-    return c_line - (name - SCORE_PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4);
+    return c_line - (name - PITCH_NAME_C) / 2.0 - 3.5 * (octave - 4);
 }
 
 /* chord->width is updated as a side effect */
@@ -265,25 +266,25 @@ _draw_note (score_t *score, cairo_t *cr,
 
     /* XXX: The hard-coded glyph indices here are very ugly. We should
      * figure out how to lookup glyphs by name from this font. */
-    switch (SCORE_PITCH_ACCIDENTAL (note->pitch)) {
-    case SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT:
+    switch (PITCH_ACCIDENTAL (note->pitch)) {
+    case PITCH_ACCIDENTAL_DOUBLE_FLAT:
            note_glyph[num_glyphs].index = 77;
            break;
-    case SCORE_PITCH_ACCIDENTAL_FLAT:
+    case PITCH_ACCIDENTAL_FLAT:
            note_glyph[num_glyphs].index = 68;
            break;
-    case SCORE_PITCH_ACCIDENTAL_NATURAL:
+    case PITCH_ACCIDENTAL_NATURAL:
            note_glyph[num_glyphs].index = 101;
            break;
-    case SCORE_PITCH_ACCIDENTAL_SHARP:
+    case PITCH_ACCIDENTAL_SHARP:
            note_glyph[num_glyphs].index = 134;
            break;
-    case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP:
+    case PITCH_ACCIDENTAL_DOUBLE_SHARP:
            note_glyph[num_glyphs].index = 142;
            break;
     }
 
-    if (SCORE_PITCH_ACCIDENTAL (note->pitch) != SCORE_PITCH_ACCIDENTAL_NATURAL)
+    if (PITCH_ACCIDENTAL (note->pitch) != PITCH_ACCIDENTAL_NATURAL)
     {
            note_glyph[num_glyphs].x = 0;
 
@@ -594,8 +595,7 @@ score_remove_chord (score_chord_t *chord)
 
 score_note_t *
 score_add_note (score_staff_t *staff,
-               score_pitch_t pitch,
-               int octave,
+               pitch_t pitch,
                score_duration_t duration)
 {
     score_note_t *note;
@@ -606,7 +606,6 @@ score_add_note (score_staff_t *staff,
     for (i = 0; i < staff->num_notes; i++) {
        note = staff->notes[i];
        if (note->pitch == pitch &&
-           note->octave == octave &&
            note->duration == duration)
        {
            return note;
@@ -619,7 +618,6 @@ score_add_note (score_staff_t *staff,
 
     note->staff = staff;
     note->pitch = pitch;
-    note->octave = octave;
     note->duration = duration;
 
     note->color.r = 0.0;
@@ -693,8 +691,7 @@ score_set_note_color_rgb (score_note_t *note,
 
 score_note_t *
 score_staff_find_note (score_staff_t *staff,
-                      score_pitch_t pitch,
-                      int octave,
+                      pitch_t pitch,
                       score_duration_t duration)
 {
     int i;
@@ -702,14 +699,9 @@ score_staff_find_note (score_staff_t *staff,
 
     for (i = 0; i < staff->num_notes; i++) {
        note = staff->notes[i];
-       if (note->pitch == pitch &&
-           note->octave == octave &&
-           note->duration == duration)
-       {
+       if (note->pitch == pitch && note->duration == duration)
            return note;
-       }
     }
 
     return NULL;
 }
-