Restructure code to manually add staves, braces, and notes.

[scherzo] / score.h

diff --git a/score.h b/score.h
index 02b56e3a0956aa18238279b9db474555db6aac4d..25d558329eb4c05923b924119daac08e8b8041e1 100644 (file)
--- a/score.h
+++ b/score.h
@@ -25,6 +25,81 @@
 #include <cairo.h>
 
 typedef struct score score_t;
+typedef struct score_staff score_staff_t;
+typedef struct score_note score_note_t;
+
+typedef enum score_pitch
+{
+    SCORE_PITCH_Aff,
+    SCORE_PITCH_Af,
+    SCORE_PITCH_A,
+    SCORE_PITCH_As,
+    SCORE_PITCH_Ass,
+
+    SCORE_PITCH_Bff,
+    SCORE_PITCH_Bf,
+    SCORE_PITCH_B,
+    SCORE_PITCH_Bs,
+    SCORE_PITCH_Bss,
+
+    SCORE_PITCH_Cff,
+    SCORE_PITCH_Cf,
+    SCORE_PITCH_C,
+    SCORE_PITCH_Cs,
+    SCORE_PITCH_Css,
+
+    SCORE_PITCH_Dff,
+    SCORE_PITCH_Df,
+    SCORE_PITCH_D,
+    SCORE_PITCH_Ds,
+    SCORE_PITCH_Dss,
+
+    SCORE_PITCH_Eff,
+    SCORE_PITCH_Ef,
+    SCORE_PITCH_E,
+    SCORE_PITCH_Es,
+    SCORE_PITCH_Ess,
+
+    SCORE_PITCH_Fff,
+    SCORE_PITCH_Ff,
+    SCORE_PITCH_F,
+    SCORE_PITCH_Fs,
+    SCORE_PITCH_Fss,
+
+    SCORE_PITCH_Gff,
+    SCORE_PITCH_Gf,
+    SCORE_PITCH_G,
+    SCORE_PITCH_Gs,
+    SCORE_PITCH_Gss
+} score_pitch_t;
+
+typedef enum score_duration
+{
+    SCORE_DURATION_WHOLE = 1,
+    SCORE_DURATION_1 = 1,
+    SCORE_DURATION_HALF = 2,
+    SCORE_DURATION_2 = 2,
+    SCORE_DURATION_QUARTER = 4,
+    SCORE_DURATION_4 = 4,
+    SCORE_DURATION_EIGHTH = 8,
+    SCORE_DURATION_8 = 8,
+    SCORE_DURATION_SIXTEENTH = 16,
+    SCORE_DURATION_16 = 16,
+    SCORE_DURATION_THIRTYSECOND = 32,
+    SCORE_DURATION_32 = 32,
+    SCORE_DURATION_SIXTYFOURTH = 64,
+    SCORE_DURATION_64 = 64,
+    SCORE_DURATION_ONEHUNDREDTWENTYEIGHTH = 128,
+    SCORE_DURATION_128 = 128
+} score_duration_t;
+
+#define SCORE_BUILD_NOTE(pitch, octave, duration) SCORE_PITCH_##pitch, (octave), SCORE_DURATION_##duration
+
+typedef enum score_clef
+{
+    SCORE_CLEF_G,
+    SCORE_CLEF_F
+} score_clef_t;
 
 /* Allocate a new, empty score object, (with optional ctx as talloc
  * owner). If ctx is NULL, the caller should call talloc_free on the
@@ -43,6 +118,32 @@ score_set_staff_height (score_t *score, int height);
 void
 score_set_width (score_t *score, int width);
 
+/* Add a brace to the score, connecting the given number of staves.
+ *
+ * The staves to be connected are those that will next be added to the
+ * score. */
+void
+score_add_brace (score_t *score, int staves);
+
+/* Add a new staff to the score */
+score_staff_t *
+score_add_staff (score_t *score, score_clef_t clef);
+
+/* Add a note to a staff of the given pitch, octave, and duration.
+ *
+ * Octave numbers are ISO octave numbers [0:8], (so Octave 4 is from
+ * middle C to the B above middle C).
+ *
+ * Duration values can be symbolic (SCORE_DURATION_WHOLE, _QUARTER,
+ * _EIGHTH, etc.) or numerical as simply the denominator (WHOLE=1,
+ * 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);
+
 /* Draw the given score_t onto the given cairo_t.
  *
  * The caller can call cairo_translate before calling score_draw to