]> git.cworth.org Git - scherzo/blobdiff - score.h
Fix bugs in mismatched spelling of chord name and notes
[scherzo] / score.h
diff --git a/score.h b/score.h
index b8791f67f1caa5f8dd0ab9257efa9997d312fb46..e71b8ab2c98b6b6754ffc551a8f26e7c4ab7fe04 100644 (file)
--- a/score.h
+++ b/score.h
@@ -51,19 +51,6 @@ typedef enum score_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;
@@ -114,14 +101,14 @@ score_add_staff (score_t *score, score_clef_t clef);
  * _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,
                      pitch_t pitch,
                      score_duration_t duration);
 
 /* Add a note to the score, (automatically selecting the nearest
  * staff) */
-score_note_t *
+void
 score_add_note (score_t *score, pitch_t pitch, score_duration_t duration);
 
 /* Add a chord symbol of 'name' to a staff.
@@ -135,13 +122,13 @@ score_chord_t *
 score_add_chord (score_staff_t *staff,
                 const char * name);
 
-/* Remove the given chord from its staff. */
+/* Remove all chords from the given staff. */
 void
-score_remove_chord (score_chord_t *chord);
+score_staff_remove_chords (score_staff_t *staff);
 
-/* Remove the given note from its staff. */
+/* Remove all chords from the score. */
 void
-score_remove_note (score_note_t *note);
+score_remove_chords (score_t *score);
 
 /* Remove all notes from the given staff. */
 void
@@ -151,19 +138,6 @@ score_staff_remove_notes (score_staff_t *staff);
 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