X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=score.c;h=e587c2799ed93a6396456b8d929388d56f482a30;hp=b9df23b2577ba3dbacce8d40fe44642ac833fb57;hb=41e993a65ab55db1f3297003fe65dd556a15f85f;hpb=08ba627b61792c7d6e31d71831f062f5a8162248

diff --git a/score.c b/score.c
index b9df23b..e587c27 100644
--- a/score.c
+++ b/score.c
@@ -177,10 +177,10 @@ _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 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 * (note->octave - 4);
 }
 
 /* chord->width is updated as a side effect */
@@ -265,25 +265,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,7 +594,7 @@ score_remove_chord (score_chord_t *chord)
 
 score_note_t *
 score_add_note (score_staff_t *staff,
-		score_pitch_t pitch,
+		pitch_t pitch,
 		int octave,
 		score_duration_t duration)
 {
@@ -693,7 +693,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,
+		       pitch_t pitch,
 		       int octave,
 		       score_duration_t duration)
 {