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(name, accidental) (((name) << SCORE_PITCH_NAME_SHIFT) | (accidental))
+
+#define SCORE_PITCH_LITERAL(literal_name, literal_accidental) SCORE_PITCH(SCORE_PITCH_NAME_##literal_name, SCORE_PITCH_ACCIDENTAL_##literal_accidental)
typedef enum score_pitch
{
- 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),
- SCORE_PITCH_Cs = SCORE_PITCH_VALUE (C, SHARP),
- SCORE_PITCH_Css = SCORE_PITCH_VALUE (C, DOUBLE_SHARP),
-
- SCORE_PITCH_Dff = SCORE_PITCH_VALUE (D, DOUBLE_FLAT),
- SCORE_PITCH_Df = SCORE_PITCH_VALUE (D, FLAT),
- SCORE_PITCH_D = SCORE_PITCH_VALUE (D, NATURAL),
- SCORE_PITCH_Ds = SCORE_PITCH_VALUE (D, SHARP),
- SCORE_PITCH_Dss = SCORE_PITCH_VALUE (D, DOUBLE_SHARP),
-
- SCORE_PITCH_Eff = SCORE_PITCH_VALUE (E, DOUBLE_FLAT),
- SCORE_PITCH_Ef = SCORE_PITCH_VALUE (E, FLAT),
- SCORE_PITCH_E = SCORE_PITCH_VALUE (E, NATURAL),
- SCORE_PITCH_Es = SCORE_PITCH_VALUE (E, SHARP),
- SCORE_PITCH_Ess = SCORE_PITCH_VALUE (E, DOUBLE_SHARP),
-
- SCORE_PITCH_Fff = SCORE_PITCH_VALUE (F, DOUBLE_FLAT),
- SCORE_PITCH_Ff = SCORE_PITCH_VALUE (F, FLAT),
- SCORE_PITCH_F = SCORE_PITCH_VALUE (F, NATURAL),
- SCORE_PITCH_Fs = SCORE_PITCH_VALUE (F, SHARP),
- SCORE_PITCH_Fss = SCORE_PITCH_VALUE (F, DOUBLE_SHARP),
-
- SCORE_PITCH_Gff = SCORE_PITCH_VALUE (G, DOUBLE_FLAT),
- SCORE_PITCH_Gf = SCORE_PITCH_VALUE (G, FLAT),
- 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_Cff = SCORE_PITCH_LITERAL (C, DOUBLE_FLAT),
+ SCORE_PITCH_Cf = SCORE_PITCH_LITERAL (C, FLAT),
+ SCORE_PITCH_C = SCORE_PITCH_LITERAL (C, NATURAL),
+ SCORE_PITCH_Cs = SCORE_PITCH_LITERAL (C, SHARP),
+ SCORE_PITCH_Css = SCORE_PITCH_LITERAL (C, DOUBLE_SHARP),
+
+ SCORE_PITCH_Dff = SCORE_PITCH_LITERAL (D, DOUBLE_FLAT),
+ SCORE_PITCH_Df = SCORE_PITCH_LITERAL (D, FLAT),
+ SCORE_PITCH_D = SCORE_PITCH_LITERAL (D, NATURAL),
+ SCORE_PITCH_Ds = SCORE_PITCH_LITERAL (D, SHARP),
+ SCORE_PITCH_Dss = SCORE_PITCH_LITERAL (D, DOUBLE_SHARP),
+
+ SCORE_PITCH_Eff = SCORE_PITCH_LITERAL (E, DOUBLE_FLAT),
+ SCORE_PITCH_Ef = SCORE_PITCH_LITERAL (E, FLAT),
+ SCORE_PITCH_E = SCORE_PITCH_LITERAL (E, NATURAL),
+ SCORE_PITCH_Es = SCORE_PITCH_LITERAL (E, SHARP),
+ SCORE_PITCH_Ess = SCORE_PITCH_LITERAL (E, DOUBLE_SHARP),
+
+ SCORE_PITCH_Fff = SCORE_PITCH_LITERAL (F, DOUBLE_FLAT),
+ SCORE_PITCH_Ff = SCORE_PITCH_LITERAL (F, FLAT),
+ SCORE_PITCH_F = SCORE_PITCH_LITERAL (F, NATURAL),
+ SCORE_PITCH_Fs = SCORE_PITCH_LITERAL (F, SHARP),
+ SCORE_PITCH_Fss = SCORE_PITCH_LITERAL (F, DOUBLE_SHARP),
+
+ SCORE_PITCH_Gff = SCORE_PITCH_LITERAL (G, DOUBLE_FLAT),
+ SCORE_PITCH_Gf = SCORE_PITCH_LITERAL (G, FLAT),
+ SCORE_PITCH_G = SCORE_PITCH_LITERAL (G, NATURAL),
+ SCORE_PITCH_Gs = SCORE_PITCH_LITERAL (G, SHARP),
+ SCORE_PITCH_Gss = SCORE_PITCH_LITERAL (G, DOUBLE_SHARP),
+
+ SCORE_PITCH_Aff = SCORE_PITCH_LITERAL (A, DOUBLE_FLAT),
+ SCORE_PITCH_Af = SCORE_PITCH_LITERAL (A, FLAT),
+ SCORE_PITCH_A = SCORE_PITCH_LITERAL (A, NATURAL),
+ SCORE_PITCH_As = SCORE_PITCH_LITERAL (A, SHARP),
+ SCORE_PITCH_Ass = SCORE_PITCH_LITERAL (A, DOUBLE_SHARP),
+
+ SCORE_PITCH_Bff = SCORE_PITCH_LITERAL (B, DOUBLE_FLAT),
+ SCORE_PITCH_Bf = SCORE_PITCH_LITERAL (B, FLAT),
+ SCORE_PITCH_B = SCORE_PITCH_LITERAL (B, NATURAL),
+ SCORE_PITCH_Bs = SCORE_PITCH_LITERAL (B, SHARP),
+ SCORE_PITCH_Bss = SCORE_PITCH_LITERAL (B, DOUBLE_SHARP)
} score_pitch_t;
typedef enum score_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 struct score_chord
+{
+ score_staff_t *staff;
+
+ char *name;
+ double width;
+} score_chord_t;
+
typedef enum score_clef
{
SCORE_CLEF_G,
* 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);
+
+/* Add a chord symbol of 'name' to a staff.
+ *
+ * For now, the chord symbols are free-form names.
+ *
+ * The chord name must be a talloc'ed string, which the returned
+ * score_chord_t will talloc_steal.
+ */
+score_chord_t *
+score_add_chord (score_staff_t *staff,
+ const char * name);
+
+/* Remove the given chord from its staff. */
+void
+score_remove_chord (score_chord_t *chord);
+
+/* Remove the given note from its staff. */
+void
+score_remove_note (score_note_t *note);
-/* Remove the given note from the given staff. */
void
-score_staff_remove_note (score_staff_t *staff, score_note_t *note);
+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. */
projects / scherzo / blobdiff