From: Carl Worth <cworth@cworth.org>
Date: Fri, 27 Sep 2013 22:21:52 +0000 (-0700)
Subject: Move large portions of score.h to new pitch.h file.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=08ba627b61792c7d6e31d71831f062f5a8162248;p=scherzo
Move large portions of score.h to new pitch.h file.
This is in preparation for doing more score-independent reasoning
about pitches.
At this point, compatibility defines are left in place so that none of
the code has to change yet.
---
diff --git a/pitch.h b/pitch.h
new file mode 100644
index 0000000..13c2905
--- /dev/null
+++ b/pitch.h
@@ -0,0 +1,98 @@
+/* scherzo - Music notation training
+ *
+ * pitch.h - Common structures and functions for pitches, etc.
+ *
+ * Copyright © 2010,2013 Carl Worth
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/ .
+ */
+
+#define PITCH_ACCIDENTAL_MASK 0x07
+#define PITCH_ACCIDENTAL_SHIFT 0
+
+typedef enum pitch_accidental
+{
+ PITCH_ACCIDENTAL_DOUBLE_FLAT,
+ PITCH_ACCIDENTAL_FLAT,
+ PITCH_ACCIDENTAL_NATURAL,
+ PITCH_ACCIDENTAL_SHARP,
+ PITCH_ACCIDENTAL_DOUBLE_SHARP
+} pitch_accidental_t;
+
+#define PITCH_ACCIDENTAL(pitch) (((pitch) & PITCH_ACCIDENTAL_MASK) >> PITCH_ACCIDENTAL_SHIFT)
+
+#define PITCH_NAME_MASK 0x38
+#define PITCH_NAME_SHIFT 3
+
+typedef enum pitch_name
+{
+ PITCH_NAME_C,
+ PITCH_NAME_D,
+ PITCH_NAME_E,
+ PITCH_NAME_F,
+ PITCH_NAME_G,
+ PITCH_NAME_A,
+ PITCH_NAME_B,
+} pitch_name_t;
+
+#define PITCH_NAME(pitch) (((pitch) & PITCH_NAME_MASK) >> PITCH_NAME_SHIFT)
+
+#define PITCH(name, accidental) (((name) << PITCH_NAME_SHIFT) | (accidental))
+
+#define PITCH_LITERAL(literal_name, literal_accidental) PITCH(PITCH_NAME_##literal_name, PITCH_ACCIDENTAL_##literal_accidental)
+
+typedef enum pitch
+{
+ PITCH_Cff = PITCH_LITERAL (C, DOUBLE_FLAT),
+ PITCH_Cf = PITCH_LITERAL (C, FLAT),
+ PITCH_C = PITCH_LITERAL (C, NATURAL),
+ PITCH_Cs = PITCH_LITERAL (C, SHARP),
+ PITCH_Css = PITCH_LITERAL (C, DOUBLE_SHARP),
+
+ PITCH_Dff = PITCH_LITERAL (D, DOUBLE_FLAT),
+ PITCH_Df = PITCH_LITERAL (D, FLAT),
+ PITCH_D = PITCH_LITERAL (D, NATURAL),
+ PITCH_Ds = PITCH_LITERAL (D, SHARP),
+ PITCH_Dss = PITCH_LITERAL (D, DOUBLE_SHARP),
+
+ PITCH_Eff = PITCH_LITERAL (E, DOUBLE_FLAT),
+ PITCH_Ef = PITCH_LITERAL (E, FLAT),
+ PITCH_E = PITCH_LITERAL (E, NATURAL),
+ PITCH_Es = PITCH_LITERAL (E, SHARP),
+ PITCH_Ess = PITCH_LITERAL (E, DOUBLE_SHARP),
+
+ PITCH_Fff = PITCH_LITERAL (F, DOUBLE_FLAT),
+ PITCH_Ff = PITCH_LITERAL (F, FLAT),
+ PITCH_F = PITCH_LITERAL (F, NATURAL),
+ PITCH_Fs = PITCH_LITERAL (F, SHARP),
+ PITCH_Fss = PITCH_LITERAL (F, DOUBLE_SHARP),
+
+ PITCH_Gff = PITCH_LITERAL (G, DOUBLE_FLAT),
+ PITCH_Gf = PITCH_LITERAL (G, FLAT),
+ PITCH_G = PITCH_LITERAL (G, NATURAL),
+ PITCH_Gs = PITCH_LITERAL (G, SHARP),
+ PITCH_Gss = PITCH_LITERAL (G, DOUBLE_SHARP),
+
+ PITCH_Aff = PITCH_LITERAL (A, DOUBLE_FLAT),
+ PITCH_Af = PITCH_LITERAL (A, FLAT),
+ PITCH_A = PITCH_LITERAL (A, NATURAL),
+ PITCH_As = PITCH_LITERAL (A, SHARP),
+ PITCH_Ass = PITCH_LITERAL (A, DOUBLE_SHARP),
+
+ PITCH_Bff = PITCH_LITERAL (B, DOUBLE_FLAT),
+ PITCH_Bf = PITCH_LITERAL (B, FLAT),
+ PITCH_B = PITCH_LITERAL (B, NATURAL),
+ PITCH_Bs = PITCH_LITERAL (B, SHARP),
+ PITCH_Bss = PITCH_LITERAL (B, DOUBLE_SHARP)
+} pitch_t;
diff --git a/score.h b/score.h
index 03add03..6eef279 100644
--- a/score.h
+++ b/score.h
@@ -24,87 +24,67 @@
#include <talloc.h>
#include <cairo.h>
-typedef struct score score_t;
-typedef struct score_staff score_staff_t;
-
-#define SCORE_PITCH_ACCIDENTAL_MASK 0x07
-#define SCORE_PITCH_ACCIDENTAL_SHIFT 0
-
-typedef enum score_pitch_accidental
-{
- SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT,
- SCORE_PITCH_ACCIDENTAL_FLAT,
- SCORE_PITCH_ACCIDENTAL_NATURAL,
- SCORE_PITCH_ACCIDENTAL_SHARP,
- SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP
-} score_pitch_accidental_t;
-
-#define SCORE_PITCH_ACCIDENTAL(pitch) (((pitch) & SCORE_PITCH_ACCIDENTAL_MASK) >> SCORE_PITCH_ACCIDENTAL_SHIFT)
-
-#define SCORE_PITCH_NAME_MASK 0x38
-#define SCORE_PITCH_NAME_SHIFT 3
-
-typedef enum score_pitch_name
-{
- 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(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_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;
+#include "pitch.h"
+
+/* Some compatibility naming until the code changes to use pitch_t and
+ * firedns in place of score_pitch_t and friends. */
+typedef pitch_accidental_t score_pitch_accidental_t;
+typedef pitch_name_t score_pitch_name_t;
+typedef pitch_t score_pitch_t;
+
+#define SCORE_PITCH_ACCIDENTAL(pitch) PITCH_ACCIDENTAL(pitch)
+#define SCORE_PITCH_NAME(pitch) PITCH_NAME(pitch)
+#define SCORE_PITCH(pitch, octave) PITCH(pitch, octave)
+
+#define SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT PITCH_ACCIDENTAL_DOUBLE_FLAT
+#define SCORE_PITCH_ACCIDENTAL_FLAT PITCH_ACCIDENTAL_FLAT
+#define SCORE_PITCH_ACCIDENTAL_NATURAL PITCH_ACCIDENTAL_NATURAL
+#define SCORE_PITCH_ACCIDENTAL_SHARP PITCH_ACCIDENTAL_SHARP
+#define SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP PITCH_ACCIDENTAL_DOUBLE_SHARP
+
+#define SCORE_PITCH_NAME_C PITCH_NAME_C
+#define SCORE_PITCH_NAME_D PITCH_NAME_D
+#define SCORE_PITCH_NAME_E PITCH_NAME_E
+#define SCORE_PITCH_NAME_F PITCH_NAME_F
+#define SCORE_PITCH_NAME_G PITCH_NAME_G
+#define SCORE_PITCH_NAME_A PITCH_NAME_A
+#define SCORE_PITCH_NAME_B PITCH_NAME_B
+
+#define SCORE_PITCH_Cff PITCH_Cff
+#define SCORE_PITCH_Cf PITCH_Cf
+#define SCORE_PITCH_C PITCH_C
+#define SCORE_PITCH_Cs PITCH_Cs
+#define SCORE_PITCH_Css PITCH_Css
+#define SCORE_PITCH_Dff PITCH_Dff
+#define SCORE_PITCH_Df PITCH_Df
+#define SCORE_PITCH_D PITCH_D
+#define SCORE_PITCH_Ds PITCH_Ds
+#define SCORE_PITCH_Dss PITCH_Dss
+#define SCORE_PITCH_Eff PITCH_Eff
+#define SCORE_PITCH_Ef PITCH_Ef
+#define SCORE_PITCH_E PITCH_E
+#define SCORE_PITCH_Es PITCH_Es
+#define SCORE_PITCH_Ess PITCH_Ess
+#define SCORE_PITCH_Fff PITCH_Fff
+#define SCORE_PITCH_Ff PITCH_Ff
+#define SCORE_PITCH_F PITCH_F
+#define SCORE_PITCH_Fs PITCH_Fs
+#define SCORE_PITCH_Fss PITCH_Fss
+#define SCORE_PITCH_Gff PITCH_Gff
+#define SCORE_PITCH_Gf PITCH_Gf
+#define SCORE_PITCH_G PITCH_G
+#define SCORE_PITCH_Gs PITCH_Gs
+#define SCORE_PITCH_Gss PITCH_Gss
+#define SCORE_PITCH_Aff PITCH_Aff
+#define SCORE_PITCH_Af PITCH_Af
+#define SCORE_PITCH_A PITCH_A
+#define SCORE_PITCH_As PITCH_As
+#define SCORE_PITCH_Ass PITCH_Ass
+#define SCORE_PITCH_Bff PITCH_Bff
+#define SCORE_PITCH_Bf PITCH_Bf
+#define SCORE_PITCH_B PITCH_B
+#define SCORE_PITCH_Bs PITCH_Bs
+#define SCORE_PITCH_Bss PITCH_Bss
typedef enum score_duration
{
@@ -128,6 +108,9 @@ 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_note
{
score_staff_t *staff;