Fix scherzo to use pitch_t rather than score_note_t for computation

[scherzo] / score.h

diff --git a/score.h b/score.h
index ece395137be54c92949c3d1951cc3f0d9368e1df..b8791f67f1caa5f8dd0ab9257efa9997d312fb46 100644 (file)
--- a/score.h
+++ b/score.h
@@ -21,9 +21,64 @@
 #ifndef SCORE_H
 #define SCORE_H
 
+#include <talloc.h>
 #include <cairo.h>
 
+#include "pitch.h"
+
+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 struct score score_t;
+typedef struct score_staff score_staff_t;
+
+typedef struct score_note
+{
+    score_staff_t *staff;
+    pitch_t pitch;
+    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,
+    SCORE_CLEF_TREBLE = SCORE_CLEF_G,
+    SCORE_CLEF_F,
+    SCORE_CLEF_BASS = 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
@@ -38,6 +93,77 @@ score_create (void *ctx);
 int
 score_set_staff_height (score_t *score, int height);
 
+/* Set the total width available for drawing the score. */
+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 and duration.
+ *
+ * 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,
+                     pitch_t pitch,
+                     score_duration_t duration);
+
+/* Add a note to the score, (automatically selecting the nearest
+ * staff) */
+score_note_t *
+score_add_note (score_t *score, pitch_t pitch, score_duration_t duration);
+
+/* 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 all notes from the given staff. */
+void
+score_staff_remove_notes (score_staff_t *staff);
+
+/* Remove all notes from the score. */
+void
+score_remove_notes (score_t *score);
+
+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. */
+score_note_t *
+score_staff_find_note (score_staff_t *staff,
+                      pitch_t pitch,
+                      score_duration_t duration);
+
 /* Draw the given score_t onto the given cairo_t.
  *
  * The caller can call cairo_translate before calling score_draw to