Port all code from score_pitch* to pitch*

[scherzo] / score.h

diff --git a/score.h b/score.h
index 6eef279f9d14b38b0e4ad8a8749e8d4f570cfd52..5dd61887d340da2bbb5ca5420af8dc23bd968bc4 100644 (file)
--- a/score.h
+++ b/score.h
@@ -26,66 +26,6 @@
 
 #include "pitch.h"
 
-/* Some compatibility naming until the code changes to use pitch_t and
- * firedns in place of score_pitch_t and friends. */
-typedef pitch_accidental_t score_pitch_accidental_t;
-typedef pitch_name_t score_pitch_name_t;
-typedef pitch_t score_pitch_t;
-
-#define SCORE_PITCH_ACCIDENTAL(pitch) PITCH_ACCIDENTAL(pitch)
-#define SCORE_PITCH_NAME(pitch) PITCH_NAME(pitch)
-#define SCORE_PITCH(pitch, octave) PITCH(pitch, octave)
-
-#define SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT     PITCH_ACCIDENTAL_DOUBLE_FLAT
-#define SCORE_PITCH_ACCIDENTAL_FLAT            PITCH_ACCIDENTAL_FLAT
-#define SCORE_PITCH_ACCIDENTAL_NATURAL         PITCH_ACCIDENTAL_NATURAL
-#define SCORE_PITCH_ACCIDENTAL_SHARP           PITCH_ACCIDENTAL_SHARP
-#define SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP    PITCH_ACCIDENTAL_DOUBLE_SHARP
-
-#define SCORE_PITCH_NAME_C PITCH_NAME_C
-#define SCORE_PITCH_NAME_D PITCH_NAME_D
-#define SCORE_PITCH_NAME_E PITCH_NAME_E
-#define SCORE_PITCH_NAME_F PITCH_NAME_F
-#define SCORE_PITCH_NAME_G PITCH_NAME_G
-#define SCORE_PITCH_NAME_A PITCH_NAME_A
-#define SCORE_PITCH_NAME_B PITCH_NAME_B
-
-#define SCORE_PITCH_Cff PITCH_Cff
-#define SCORE_PITCH_Cf PITCH_Cf
-#define SCORE_PITCH_C PITCH_C
-#define SCORE_PITCH_Cs PITCH_Cs
-#define SCORE_PITCH_Css PITCH_Css
-#define SCORE_PITCH_Dff PITCH_Dff
-#define SCORE_PITCH_Df PITCH_Df
-#define SCORE_PITCH_D PITCH_D
-#define SCORE_PITCH_Ds PITCH_Ds
-#define SCORE_PITCH_Dss PITCH_Dss
-#define SCORE_PITCH_Eff PITCH_Eff
-#define SCORE_PITCH_Ef PITCH_Ef
-#define SCORE_PITCH_E PITCH_E
-#define SCORE_PITCH_Es PITCH_Es
-#define SCORE_PITCH_Ess PITCH_Ess
-#define SCORE_PITCH_Fff PITCH_Fff
-#define SCORE_PITCH_Ff PITCH_Ff
-#define SCORE_PITCH_F PITCH_F
-#define SCORE_PITCH_Fs PITCH_Fs
-#define SCORE_PITCH_Fss PITCH_Fss
-#define SCORE_PITCH_Gff PITCH_Gff
-#define SCORE_PITCH_Gf PITCH_Gf
-#define SCORE_PITCH_G PITCH_G
-#define SCORE_PITCH_Gs PITCH_Gs
-#define SCORE_PITCH_Gss PITCH_Gss
-#define SCORE_PITCH_Aff PITCH_Aff
-#define SCORE_PITCH_Af PITCH_Af
-#define SCORE_PITCH_A PITCH_A
-#define SCORE_PITCH_As PITCH_As
-#define SCORE_PITCH_Ass PITCH_Ass
-#define SCORE_PITCH_Bff PITCH_Bff
-#define SCORE_PITCH_Bf PITCH_Bf
-#define SCORE_PITCH_B PITCH_B
-#define SCORE_PITCH_Bs PITCH_Bs
-#define SCORE_PITCH_Bss PITCH_Bss
-
 typedef enum score_duration
 {
     SCORE_DURATION_WHOLE = 1,
@@ -114,7 +54,7 @@ typedef struct score_staff score_staff_t;
 typedef struct score_note
 {
     score_staff_t *staff;
-    score_pitch_t pitch;
+    pitch_t pitch;
     int octave;
     score_duration_t duration;
 
@@ -180,7 +120,7 @@ score_add_staff (score_t *score, score_clef_t clef);
  */
 score_note_t *
 score_add_note (score_staff_t *staff,
-               score_pitch_t pitch,
+               pitch_t pitch,
                int octave,
                score_duration_t);
 
@@ -213,7 +153,7 @@ score_set_note_color_rgb (score_note_t *note,
  * octave, and durations. Returns NULL if no match is found. */
 score_note_t *
 score_staff_find_note (score_staff_t *staff,
-                      score_pitch_t pitch,
+                      pitch_t pitch,
                       int octave,
                       score_duration_t duration);