Fix high octave numbers (8+) to not be interpreted as 0.

[scherzo] / score.h

diff --git a/score.h b/score.h
index 25d558329eb4c05923b924119daac08e8b8041e1..d2de1091c5cecdce1bd6cc6d4bb4d5d513c9e3f1 100644 (file)
--- a/score.h
+++ b/score.h
@@ -24,54 +24,7 @@
 #include <talloc.h>
 #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;
+#include "scherzo-key.h"
 
 typedef enum score_duration
 {
@@ -95,10 +48,23 @@ typedef enum score_duration
 
 #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_chord
+{
+    score_staff_t *staff;
+
+    char *name;
+    double width;
+} score_chord_t;
+
 typedef enum score_clef
 {
     SCORE_CLEF_G,
-    SCORE_CLEF_F
+    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
@@ -118,6 +84,10 @@ score_set_staff_height (score_t *score, int height);
 void
 score_set_width (score_t *score, int width);
 
+/* Set the key for this score */
+void
+score_set_key (score_t *score, pitch_t key);
+
 /* 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
@@ -129,20 +99,48 @@ score_add_brace (score_t *score, int staves);
 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).
+/* 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 *
+void
 score_staff_add_note (score_staff_t *staff,
-                     score_pitch_t pitch,
-                     int octave,
-                     score_duration_t);
+                     pitch_t pitch,
+                     score_duration_t duration);
+
+/* Add a note to the score, (automatically selecting the nearest
+ * staff) */
+void
+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 all chords from the given staff. */
+void
+score_staff_remove_chords (score_staff_t *staff);
+
+/* Remove all chords from the score. */
+void
+score_remove_chords (score_t *score);
+
+/* 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);
 
 /* Draw the given score_t onto the given cairo_t.
  *