Fix the broken SCORE_PITCH_NAME macro to work correctly

[scherzo] / score.h

diff --git a/score.h b/score.h
index a07b9266d4aa5725f0221200c791165e407d81dd..fe627b8ad401ab489bd073ee47adcd530b6c8bd5 100644 (file)
--- a/score.h
+++ b/score.h
@@ -26,7 +26,6 @@
 
 typedef struct score score_t;
 typedef struct score_staff score_staff_t;
-typedef struct score_note score_note_t;
 
 #define SCORE_PITCH_ACCIDENTAL_MASK 0x07
 #define SCORE_PITCH_ACCIDENTAL_SHIFT 0
@@ -47,33 +46,21 @@ typedef enum score_pitch_accidental
 
 typedef enum score_pitch_name
 {
-    SCORE_PITCH_NAME_C = 0 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_D = 1 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_E = 2 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_F = 3 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_G = 4 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_A = 5 << SCORE_PITCH_NAME_SHIFT,
-    SCORE_PITCH_NAME_B = 6 << SCORE_PITCH_NAME_SHIFT
+    SCORE_PITCH_NAME_C,
+    SCORE_PITCH_NAME_D,
+    SCORE_PITCH_NAME_E,
+    SCORE_PITCH_NAME_F,
+    SCORE_PITCH_NAME_G,
+    SCORE_PITCH_NAME_A,
+    SCORE_PITCH_NAME_B,
 } score_pitch_name_t;
 
 #define SCORE_PITCH_NAME(pitch) (((pitch) & SCORE_PITCH_NAME_MASK) >> SCORE_PITCH_NAME_SHIFT)
 
-#define SCORE_PITCH_VALUE(name, accidental) ((SCORE_PITCH_NAME_##name) + (SCORE_PITCH_ACCIDENTAL_##accidental))
+#define SCORE_PITCH_VALUE(name, accidental) ((SCORE_PITCH_NAME_##name << SCORE_PITCH_NAME_SHIFT) + (SCORE_PITCH_ACCIDENTAL_##accidental))
 
 typedef enum score_pitch
 {
-    SCORE_PITCH_Aff = SCORE_PITCH_VALUE (A, DOUBLE_FLAT), 
-    SCORE_PITCH_Af  = SCORE_PITCH_VALUE (A, FLAT),       
-    SCORE_PITCH_A   = SCORE_PITCH_VALUE (A, NATURAL),    
-    SCORE_PITCH_As  = SCORE_PITCH_VALUE (A, SHARP),      
-    SCORE_PITCH_Ass = SCORE_PITCH_VALUE (A, DOUBLE_SHARP),
-
-    SCORE_PITCH_Bff = SCORE_PITCH_VALUE (B, DOUBLE_FLAT), 
-    SCORE_PITCH_Bf  = SCORE_PITCH_VALUE (B, FLAT),       
-    SCORE_PITCH_B   = SCORE_PITCH_VALUE (B, NATURAL),    
-    SCORE_PITCH_Bs  = SCORE_PITCH_VALUE (B, SHARP),      
-    SCORE_PITCH_Bss = SCORE_PITCH_VALUE (B, DOUBLE_SHARP),
-
     SCORE_PITCH_Cff = SCORE_PITCH_VALUE (C, DOUBLE_FLAT), 
     SCORE_PITCH_Cf  = SCORE_PITCH_VALUE (C, FLAT),       
     SCORE_PITCH_C   = SCORE_PITCH_VALUE (C, NATURAL),    
@@ -103,6 +90,18 @@ typedef enum score_pitch
     SCORE_PITCH_G   = SCORE_PITCH_VALUE (G, NATURAL),    
     SCORE_PITCH_Gs  = SCORE_PITCH_VALUE (G, SHARP),      
     SCORE_PITCH_Gss = SCORE_PITCH_VALUE (G, DOUBLE_SHARP),
+
+    SCORE_PITCH_Aff = SCORE_PITCH_VALUE (A, DOUBLE_FLAT), 
+    SCORE_PITCH_Af  = SCORE_PITCH_VALUE (A, FLAT),       
+    SCORE_PITCH_A   = SCORE_PITCH_VALUE (A, NATURAL),    
+    SCORE_PITCH_As  = SCORE_PITCH_VALUE (A, SHARP),      
+    SCORE_PITCH_Ass = SCORE_PITCH_VALUE (A, DOUBLE_SHARP),
+
+    SCORE_PITCH_Bff = SCORE_PITCH_VALUE (B, DOUBLE_FLAT), 
+    SCORE_PITCH_Bf  = SCORE_PITCH_VALUE (B, FLAT),       
+    SCORE_PITCH_B   = SCORE_PITCH_VALUE (B, NATURAL),    
+    SCORE_PITCH_Bs  = SCORE_PITCH_VALUE (B, SHARP),      
+    SCORE_PITCH_Bss = SCORE_PITCH_VALUE (B, DOUBLE_SHARP)
 } score_pitch_t;
 
 typedef enum score_duration
@@ -127,6 +126,20 @@ typedef enum score_duration
 
 #define SCORE_BUILD_NOTE(pitch, octave, duration) SCORE_PITCH_##pitch, (octave), SCORE_DURATION_##duration
 
+typedef struct score_note
+{
+    score_staff_t *staff;
+    score_pitch_t pitch;
+    int octave;
+    score_duration_t duration;
+
+    struct {
+       double r;
+       double g;
+       double b;
+    } color;
+} score_note_t;
+
 typedef enum score_clef
 {
     SCORE_CLEF_G,
@@ -173,14 +186,20 @@ score_add_staff (score_t *score, score_clef_t clef);
  * QUARTER=4, EIGHTH=8, etc.)
  */
 score_note_t *
-score_staff_add_note (score_staff_t *staff,
-                     score_pitch_t pitch,
-                     int octave,
-                     score_duration_t);
+score_add_note (score_staff_t *staff,
+               score_pitch_t pitch,
+               int octave,
+               score_duration_t);
 
 /* Remove the given note from the given staff. */
 void
-score_staff_remove_note (score_staff_t *staff, score_note_t *note);
+score_remove_note (score_note_t *note);
+
+void
+score_set_note_color_rgb (score_note_t *note,
+                         double r,
+                         double g,
+                         double b);
 
 /* Return the first note on the given staff with the given pitch,
  * octave, and durations. Returns NULL if no match is found. */