#include <asoundlib.h>
#include "score.h"
+#include "mnemon.h"
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
#define unused(foo) foo __attribute__((unused))
#define MIDI_BUF_SIZE 4096
+typedef struct challenge
+{
+ bin_t *bin;
+ int item_index;
+ score_staff_t *staff;
+ score_note_t *note;
+
+ int satisfied;
+ int mistaken;
+} challenge_t;
+
+typedef struct note_group
+{
+ void *ctx;
+ score_note_t **notes;
+ int size;
+ int num_notes;
+} note_group_t;
+
typedef struct scherzo
{
+ void *ctx;
+
GtkWidget *window;
score_t *score;
int staff_height;
score_staff_t *treble;
score_staff_t *bass;
+ score_chord_t *chord;
+
+ /* The word "keyboard" here is referring to a "computer
+ * keyboard". Any "piano keyboard" key knows its own octave and
+ * accidental already. */
+ int keyboard_octave;
+ pitch_accidental_t keyboard_accidental;
+
int midi_fd;
snd_midi_event_t *snd_midi_event;
+
+ mnemon_t mnemon;
+ challenge_t challenge;
+
+ note_group_t notes_pressed;
+ note_group_t notes_pedaled;
+
+ int pedal_pressed;
} scherzo_t;
+/* Forward declarations. */
+static score_note_t *
+scherzo_press_note (scherzo_t *scherzo, pitch_t pitch, int octave);
+
+static void
+scherzo_release_note (scherzo_t *scherzo, pitch_t pitch, int octave);
+
+static void
+scherzo_press_pedal (scherzo_t *scherzo);
+
+static void
+scherzo_release_pedal (scherzo_t *scherzo);
+
+static void
+_judge_note (scherzo_t *scherzo, score_note_t *note);
+
+static void
+_score_challenge (scherzo_t *scherzo);
+
static int
on_delete_event_quit (unused (GtkWidget *widget),
unused (GdkEvent *event),
cairo_paint (cr);
/* Add some padding on the sides and top */
- cairo_translate (cr, pad, (int) scherzo->staff_height / 2);
+ cairo_translate (cr, pad, scherzo->staff_height);
score_set_staff_height (score, scherzo->staff_height);
score_set_width (score, widget_width - 2 * pad);
void *user_data)
{
scherzo_t *scherzo = user_data;
+ int octave;
+ /* Initialize to keep the compiler quiet. */
+ pitch_name_t pitch_name = PITCH_NATURAL (C);
+ pitch_t pitch;
+
+ if (scherzo->challenge.note)
+ octave = scherzo->challenge.note->octave;
+ else
+ octave = scherzo->keyboard_octave;
switch (key->keyval) {
case GDK_KEY_plus:
case GDK_KEY_Escape:
gtk_main_quit ();
return FALSE;
+ case GDK_KEY_c:
+ case GDK_KEY_C:
+ pitch_name = PITCH_NAME_C;
+ break;
+ case GDK_KEY_d:
+ case GDK_KEY_D:
+ pitch_name = PITCH_NAME_D;
+ break;
+ case GDK_KEY_e:
+ case GDK_KEY_E:
+ pitch_name = PITCH_NAME_E;
+ break;
+ case GDK_KEY_f:
+ case GDK_KEY_F:
+ pitch_name = PITCH_NAME_F;
+ break;
+ case GDK_KEY_g:
+ case GDK_KEY_G:
+ pitch_name = PITCH_NAME_G;
+ break;
+ case GDK_KEY_a:
+ case GDK_KEY_A:
+ pitch_name = PITCH_NAME_A;
+ break;
+ case GDK_KEY_b:
+ case GDK_KEY_B:
+ pitch_name = PITCH_NAME_B;
+ break;
+ case GDK_KEY_0:
+ case GDK_KEY_1:
+ case GDK_KEY_2:
+ case GDK_KEY_3:
+ case GDK_KEY_4:
+ case GDK_KEY_5:
+ case GDK_KEY_6:
+ case GDK_KEY_7:
+ case GDK_KEY_8:
+ scherzo->keyboard_octave = key->keyval - GDK_KEY_0;
+ break;
+ case GDK_KEY_space:
+ scherzo_press_pedal (scherzo);
+ break;
+ case GDK_KEY_Up:
+ if (scherzo->keyboard_accidental < PITCH_ACCIDENTAL_DOUBLE_SHARP)
+ scherzo->keyboard_accidental++;
+ break;
+ case GDK_KEY_Down:
+ if (scherzo->keyboard_accidental > PITCH_ACCIDENTAL_DOUBLE_FLAT)
+ scherzo->keyboard_accidental--;
+ break;
+ }
+
+ pitch = PITCH (pitch_name, scherzo->keyboard_accidental);
+
+ if ((key->keyval >= GDK_KEY_A && key->keyval <= GDK_KEY_G) ||
+ (key->keyval >= GDK_KEY_a && key->keyval <= GDK_KEY_g))
+ {
+ score_note_t *note;
+
+ note = scherzo_press_note (scherzo, pitch, octave);
+ _judge_note (scherzo, note);
+ gtk_widget_queue_draw (scherzo->window);
+
+ return TRUE;
}
- /* Allow the event to propagate to other handlers. */
+
+ /* Allow an unhandled event to propagate to other handlers. */
return FALSE;
}
+static int
+on_key_release_event (unused (GtkWidget *widget),
+ GdkEventKey *key,
+ void *user_data)
+{
+ scherzo_t *scherzo = user_data;
+ int octave;
+ /* Initialize to keep the compiler quiet. */
+ pitch_name_t pitch_name = PITCH_NAME_C;
+ pitch_t pitch;
+
+ if (scherzo->challenge.note)
+ octave = scherzo->challenge.note->octave;
+ else
+ octave = scherzo->keyboard_octave;
+
+ switch (key->keyval) {
+ case GDK_KEY_c:
+ case GDK_KEY_C:
+ pitch_name = PITCH_NAME_C;
+ break;
+ case GDK_KEY_d:
+ case GDK_KEY_D:
+ pitch_name = PITCH_NAME_D;
+ break;
+ case GDK_KEY_e:
+ case GDK_KEY_E:
+ pitch_name = PITCH_NAME_E;
+ break;
+ case GDK_KEY_f:
+ case GDK_KEY_F:
+ pitch_name = PITCH_NAME_F;
+ break;
+ case GDK_KEY_g:
+ case GDK_KEY_G:
+ pitch_name = PITCH_NAME_G;
+ break;
+ case GDK_KEY_a:
+ case GDK_KEY_A:
+ pitch_name = PITCH_NAME_A;
+ break;
+ case GDK_KEY_b:
+ case GDK_KEY_B:
+ pitch_name = PITCH_NAME_B;
+ break;
+ case GDK_KEY_space:
+ scherzo_release_pedal (scherzo);
+ break;
+ }
+
+ pitch = PITCH (pitch_name, scherzo->keyboard_accidental);
+
+ if ((key->keyval >= GDK_KEY_A && key->keyval <= GDK_KEY_G) ||
+ (key->keyval >= GDK_KEY_a && key->keyval <= GDK_KEY_g))
+ {
+ scherzo_release_note (scherzo, pitch, octave);
+ _score_challenge (scherzo);
+ gtk_widget_queue_draw (scherzo->window);
+
+ return TRUE;
+ }
+
+
+ /* Allow an unhandled event to propagate to other handlers. */
+ return FALSE;
+}
+
+static unsigned char
+_pitch_and_octave_to_midi (pitch_t pitch,
+ int octave)
+{
+ unsigned char midi_note = 12 * (octave + 1);
+
+ switch (PITCH_NAME (pitch)) {
+ case PITCH_NAME_C:
+ break;
+ case PITCH_NAME_D:
+ midi_note += 2;
+ break;
+ case PITCH_NAME_E:
+ midi_note += 4;
+ break;
+ case PITCH_NAME_F:
+ midi_note += 5;
+ break;
+ case PITCH_NAME_G:
+ midi_note += 7;
+ break;
+ case PITCH_NAME_A:
+ midi_note += 9;
+ break;
+ case PITCH_NAME_B:
+ midi_note += 11;
+ break;
+ }
+
+ switch (PITCH_ACCIDENTAL (pitch)) {
+ case PITCH_ACCIDENTAL_DOUBLE_FLAT:
+ midi_note -= 2;
+ break;
+ case PITCH_ACCIDENTAL_FLAT:
+ midi_note -= 1;
+ break;
+ case PITCH_ACCIDENTAL_NATURAL:
+ break;
+ case PITCH_ACCIDENTAL_SHARP:
+ midi_note += 1;
+ break;
+ case PITCH_ACCIDENTAL_DOUBLE_SHARP:
+ midi_note += 2;
+ break;
+ }
+
+ return midi_note;
+}
+
+/* octave can optionally by NULL */
static void
-_midi_to_score_pitch_and_octave (unsigned char midi_note,
- score_pitch_t *pitch,
+_midi_to_pitch_and_octave (unsigned char midi_note,
+ pitch_t *pitch,
int *octave)
{
- *octave = midi_note / 12 - 1;
+ if (octave)
+ *octave = midi_note / 12 - 1;
switch (midi_note % 12)
{
case 0:
- *pitch = SCORE_PITCH_C;
+ *pitch = PITCH_LITERAL (C, NATURAL);
break;
case 1:
- *pitch = SCORE_PITCH_Cs;
+ *pitch = PITCH_LITERAL (C, SHARP);
break;
case 2:
- *pitch = SCORE_PITCH_D;
+ *pitch = PITCH_LITERAL (D, NATURAL);
break;
case 3:
- *pitch = SCORE_PITCH_Ds;
+ *pitch = PITCH_LITERAL (D, SHARP);
break;
case 4:
- *pitch = SCORE_PITCH_E;
+ *pitch = PITCH_LITERAL (E, NATURAL);
break;
case 5:
- *pitch = SCORE_PITCH_F;
+ *pitch = PITCH_LITERAL (F, NATURAL);
break;
case 6:
- *pitch = SCORE_PITCH_Fs;
+ *pitch = PITCH_LITERAL (F, SHARP);
break;
case 7:
- *pitch = SCORE_PITCH_G;
+ *pitch = PITCH_LITERAL (G, NATURAL);
break;
case 8:
- *pitch = SCORE_PITCH_Gs;
+ *pitch = PITCH_LITERAL (G, SHARP);
break;
case 9:
- *pitch = SCORE_PITCH_A;
+ *pitch = PITCH_LITERAL (A, NATURAL);
break;
case 10:
- *pitch = SCORE_PITCH_As;
+ *pitch = PITCH_LITERAL (A, SHARP);
break;
case 11:
- *pitch = SCORE_PITCH_B;
+ *pitch = PITCH_LITERAL (B, NATURAL);
break;
}
}
+/* Determine a chord name (if any) from the current notes pressed */
+
+typedef struct analyzed_note {
+ /* Original note being analzyed. */
+ score_note_t *note;
+
+ /* Absolute pitch (expressed as midi number). */
+ int midi_pitch;
+
+ /* Pitch relative to bass note. */
+ int relative_pitch;
+} analyzed_note_t;
+
+static int
+_compare_analyzed_note_by_midi_pitch (const void *va, const void *vb)
+{
+ const analyzed_note_t *a = va, *b = vb;
+
+ return a->midi_pitch - b->midi_pitch;
+}
+
+static int
+_compare_analyzed_note_by_relative_pitch (const void *va, const void *vb)
+{
+ const analyzed_note_t *a = va, *b = vb;
+
+ return a->relative_pitch - b->relative_pitch;
+}
+
+typedef struct modified_degree
+{
+ int degree;
+ int modification;
+} modified_degree_t;
+
+static int
+_modified_degree_to_half_steps (const modified_degree_t *degree)
+{
+ int half_steps;
+ int scale_degree = degree->degree;
+
+ /* Restrict to actual degrees within a scale. */
+ if (scale_degree > 7)
+ scale_degree = (scale_degree % 8) + 1;
+
+ /* Number of half steps from root to specified degree within a
+ * diatonic scale. */
+ switch (scale_degree) {
+ case 1:
+ half_steps = 0;
+ break;
+ case 2:
+ half_steps = 2;
+ break;
+ case 3:
+ half_steps = 4;
+ break;
+ case 4:
+ half_steps = 5;
+ break;
+ case 5:
+ half_steps = 7;
+ break;
+ case 6:
+ half_steps = 9;
+ break;
+ case 7:
+ half_steps = 11;
+ break;
+ default:
+ fprintf (stderr, "Internal: Invalid degree %d\n", degree->degree);
+ exit (1);
+ break;
+ }
+
+ return half_steps + degree->modification;
+}
+
+/* Number of half steps from 'root' up to 'pitch' (that is, counting
+ * the steps up a chromatic scale). */
+static int
+_pitch_from_root_in_half_steps (pitch_t pitch, pitch_t root)
+{
+ int root_midi = _pitch_and_octave_to_midi (root, 0);
+ int pitch_midi = _pitch_and_octave_to_midi (pitch, 0);
+
+ if (pitch_midi < root_midi)
+ pitch_midi += 12;
+
+ if (pitch_midi < root_midi) {
+ fprintf (stderr, "Internal error: midi values differ by more than expected.\n");
+ exit (1);
+ }
+
+ return (pitch_midi - root_midi) % 12;
+}
+
+static int
+_chord_signature_matches (analyzed_note_t *notes,
+ int num_notes,
+ modified_degree_t *degrees,
+ int num_degrees,
+ int inversion,
+ pitch_t *root)
+{
+#define MAX_DEGREES 6
+ int relative_pitches[MAX_DEGREES];
+ int i, root_index;
+
+ assert (num_degrees <= MAX_DEGREES);
+
+ if (num_notes != num_degrees)
+ return 0;
+
+ if (inversion >= num_degrees)
+ return 0;
+
+ /* We never spell simple intervals as inversions. */
+ if (num_degrees == 2 && inversion > 0)
+ return 0;
+
+ for (i = 0; i < num_degrees; i++) {
+ /* The num_degrees is in the addition just to ensure all
+ * inputs to the modulus operator remain positive. */
+ int index = (i + num_degrees - inversion) % num_degrees;
+
+ /* Again, adding a 12 to keep things positive. */
+ relative_pitches[index] =
+ (12 +
+ _modified_degree_to_half_steps (°rees[i]) -
+ _modified_degree_to_half_steps (°rees[inversion])) % 12;
+
+ }
+
+ for (i = 0; i < num_notes; i++)
+ if (notes[i].relative_pitch != relative_pitches[i])
+ return 0;
+
+ root_index = (num_notes - inversion) % num_notes;
+ *root = notes[root_index].note->pitch;
+
+ return 1;
+}
+
+static const char *
+_pitch_str (pitch_t pitch)
+{
+ static char double_flat[] = "X𝄫";
+ static char flat[] = "X♭";
+ static char natural[] = "X";
+ static char sharp[] = "X♯";
+ static char double_sharp[] = "X𝄪";
+ char *ret;
+
+ switch (PITCH_ACCIDENTAL (pitch)) {
+ case PITCH_ACCIDENTAL_DOUBLE_FLAT:
+ ret = double_flat;
+ break;
+ case PITCH_ACCIDENTAL_FLAT:
+ ret = flat;
+ break;
+ case PITCH_ACCIDENTAL_NATURAL:
+ ret = natural;
+ break;
+ case PITCH_ACCIDENTAL_SHARP:
+ ret = sharp;
+ break;
+ case PITCH_ACCIDENTAL_DOUBLE_SHARP:
+ ret = double_sharp;
+ break;
+ }
+
+ switch (PITCH_NAME(pitch)) {
+ case PITCH_NAME_C:
+ ret[0] = 'C';
+ break;
+ case PITCH_NAME_D:
+ ret[0] = 'D';
+ break;
+ case PITCH_NAME_E:
+ ret[0] = 'E';
+ break;
+ case PITCH_NAME_F:
+ ret[0] = 'F';
+ break;
+ case PITCH_NAME_G:
+ ret[0] = 'G';
+ break;
+ case PITCH_NAME_A:
+ ret[0] = 'A';
+ break;
+ case PITCH_NAME_B:
+ ret[0] = 'B';
+ break;
+ }
+
+ return ret;
+}
+
+typedef struct chord_signature
+{
+ int num_degrees;
+ modified_degree_t degrees[MAX_DEGREES];
+ const char *name;
+} chord_signature_t;
+
+/* XXX: The superscript rise value should be relative to the current
+ * font size. Best would be for pango to support this. See:
+ *
+ * https://bugzilla.gnome.org/show_bug.cgi?id=708780
+ *
+ * For now, these are emipirically-derived values that look reasonable
+ * at the default size that score.c is using to draw the staff. If the
+ * user scales the staff up or down then these will look wrong.
+ */
+
+#define SUP "<span font='33' rise='30000'>"
+#define PUS "</span>"
+
+chord_signature_t signatures[] = {
+ /* Octave */
+ { 1, {{1, 0}}, "P8" },
+
+ /* Intervals */
+ { 2, {{1, 0}, {2, -1}}, "m2" },
+ { 2, {{1, 0}, {2, 0}}, "M2" },
+ { 2, {{1, 0}, {3, -1}}, "m3" },
+ { 2, {{1, 0}, {3, 0}}, "M3" },
+ { 2, {{1, 0}, {4, 0}}, "P4" },
+ { 2, {{1, 0}, {5, -1}}, "Tri-tone" },
+ { 2, {{1, 0}, {5, 0}}, "P5" },
+ { 2, {{1, 0}, {6, -1}}, "m6" },
+ { 2, {{1, 0}, {6, 0}}, "M6" },
+ { 2, {{1, 0}, {7, -1}}, "m7" },
+ { 2, {{1, 0}, {7, 0}}, "M7" },
+
+ /* Triads */
+ { 3, {{1, 0}, {4, 0}, {5, 0}}, "sus" },
+ { 3, {{1, 0}, {3, 0}, {5, +1}}, SUP "+" PUS },
+ { 3, {{1, 0}, {3, 0}, {5, 0}}, "" },
+ { 3, {{1, 0}, {3, -1}, {5, 0}}, "m" },
+ { 3, {{1, 0}, {3, -1}, {5, -1}}, "°" },
+ { 3, {{1, 0}, {2, 0}, {5, 0}}, "msus2" },
+
+ /* Seventh chords with no 3rd */
+ { 3, {{1, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS },
+ { 3, {{1, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
+ { 3, {{1, 0}, {5, 0}, {7, 0}}, "M7" },
+ { 3, {{1, 0}, {5, 0}, {7, -1}}, "7" },
+ { 3, {{1, 0}, {5, -1}, {7, -1}}, "7♭5" },
+
+ /* Seventh chords with no 5th */
+ { 3, {{1, 0}, {4, 0}, {7, 0}}, "M7sus" },
+ { 3, {{1, 0}, {4, 0}, {7, -1}}, "7sus" },
+ { 3, {{1, 0}, {3, 0}, {7, 0}}, "M7" },
+ { 3, {{1, 0}, {3, 0}, {7, -1}}, "7" },
+ { 3, {{1, 0}, {3, -1}, {7, 0}}, "m" SUP "M7" PUS },
+ { 3, {{1, 0}, {3, -1}, {7, -1}}, "m7" },
+ { 3, {{1, 0}, {2, 0}, {7, 0}}, "m" SUP "M7" PUS "sus2" },
+ { 3, {{1, 0}, {2, 0}, {7, -1}}, "m7sus2" },
+
+ /* Sixth chords */
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {6, 0}}, "6sus" },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {6, 0}}, "6" }, /* Ambiguous with m7 */
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {6, 0}}, "m6" },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {6, 0}}, "m6sus2" },
+
+ /* Seventh chords */
+ { 4, {{1, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS "sus" },
+ { 4, {{1, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS "sus" },
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {7, 0}}, "M7sus" },
+ { 4, {{1, 0}, {4, 0}, {5, 0}, {7, -1}}, "7sus" },
+ { 4, {{1, 0}, {4, 0}, {5, -1}, {7, -1}}, "7♭5sus" },
+ { 4, {{1, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS },
+ { 4, {{1, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {7, 0}}, "M7" },
+ { 4, {{1, 0}, {3, 0}, {5, 0}, {7, -1}}, "7" },
+ { 4, {{1, 0}, {3, 0}, {5, -1}, {7, -1}}, "7♭5" },
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, 0}, {7, -1}}, "m7" },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS },
+ { 4, {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "7" PUS },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, 0}, {7, -1}}, "m7sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS "sus2" },
+ { 4, {{1, 0}, {2, 0}, {5, -1}, {7, -2}}, "°" SUP "7" PUS "sus2" }, /* Ambiguous with 7 */
+
+ /* The sorting for chords with degree higher than 9 is funny
+ * to keep the array in degree order after reducing each
+ * degree to an actual scale degree, (9 -> 2, 11 -> 4, 13 ->
+ * 6) */
+
+ /* Ninth chords voiced with no 5th */
+ { 4, {{1, 0}, {9, 0}, {4, 0}, {7, 0}}, "M9sus" },
+ { 4, {{1, 0}, {9, 0}, {4, 0}, {7, -1}}, "9sus" },
+ { 4, {{1, 0}, {9, 0}, {3, 0}, {7, 0}}, "M9" },
+ { 4, {{1, 0}, {9, 0}, {3, 0}, {7, -1}}, "9" },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {7, 0}}, "m" SUP "M9" PUS },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {7, -1}}, "m9" },
+ { 4, {{1, 0}, {9, -1}, {3, -1}, {7, -1}}, "m♭9" },
+ { 4, {{1, 0}, {9, 0}, {3, -1}, {6, 0}}, "m6/9" },
+ { 4, {{1, 0}, {9, -1}, {3, -1}, {6, 0}}, "m6/♭9" },
+
+ /* Sixth plus 9 */
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {6, 0}}, "6/9" },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {6, 0}}, "m6/9" },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, 0}, {6, 0}}, "m6/♭9" },
+
+ /* Seventh plus altered 9 */
+ { 5, {{1, 0}, {9, +1}, {3, 0}, {5, 0}, {7, -1}}, "7♯9" },
+ { 5, {{1, 0}, {9, -1}, {3, 0}, {5, 0}, {7, -1}}, "7♭9" },
+ { 5, {{1, 0}, {9, +1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♯9" },
+ { 5, {{1, 0}, {9, -1}, {3, 0}, {5, -1}, {7, -1}}, "7♭5♭9" },
+
+ /* Ninth chords */
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS "sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS "sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, 0}}, "M9sus" },
+ { 5, {{1, 0}, {9, 0}, {4, 0}, {5, 0}, {7, -1}}, "9sus" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, 0}}, "M9" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, 0}, {7, -1}}, "9" },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, 0}, {7, -1}}, "m9" },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, 0}, {7, -1}}, "m♭9" },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, 0}}, "M9" SUP "♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, 0}, {5, -1}, {7, -1}}, "9" SUP "♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, 0}}, "m" SUP "M9♭5" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "9" PUS },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "♭9" PUS },
+ { 5, {{1, 0}, {9, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "9" PUS },
+ { 5, {{1, 0}, {9, -1}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "♭9" PUS },
+
+ /* Eleventh chords */
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, 0}}, SUP "+M11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, +1}, {7, -1}}, SUP "+11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, 0}}, "M11" },
+ { 6, {{1, 0}, {9, 0}, {3, 0}, {11, 0}, {5, 0}, {7, -1}}, "11" },
+ { 6, {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, 0}}, "m" SUP "M11" PUS },
+ { 6, {{1, 0}, {9, 0}, {3, -1}, {11, 0}, {5, 0}, {7, -1}}, "m11" },
+ { 6, {{1, 0}, {9, -1}, {3, -1}, {11, 0}, {5, -1}, {7, -1}}, "𝆩" SUP "11" PUS },
+ { 6, {{1, 0}, {9, -1}, {3, -1}, {11, -1}, {5, -1}, {7, -2}}, "°" SUP "11" PUS }
+};
+
static void
-scherzo_add_note_midi (scherzo_t *scherzo, unsigned char midi_note)
+scherzo_adjust_note_to_match_modified_degree (score_note_t *note,
+ pitch_t root,
+ modified_degree_t *degree)
{
- score_staff_t *staff;
- score_pitch_t pitch;
- int octave;
+ pitch_name_t name = PITCH_NAME (note->pitch);
+ pitch_accidental_t accidental = PITCH_ACCIDENTAL (note->pitch);
+ int degree_zero_based = (degree->degree - 1) % 7;
+ int degree_delta;
- /* Anything at Middle C and above goes on the treble staff by default. */
- if (midi_note >= 60)
- staff = scherzo->treble;
+ int note_degree_zero_based = name - PITCH_NAME (root);
+ if (note_degree_zero_based < 0)
+ note_degree_zero_based += 7;
+
+ if (note_degree_zero_based == degree_zero_based)
+ return;
+
+ degree_delta = note_degree_zero_based - degree_zero_based;
+ if (degree_delta > 3)
+ degree_delta = - (7 - degree_delta);
+ if (degree_delta < -3)
+ degree_delta = - (-7 - degree_delta);
+
+ if (abs (degree_delta) != 1) {
+ fprintf (stderr, "Internal error: Cannot adjust a note more than one degree (%d vs. %d).\n", note_degree_zero_based + 1, degree->degree);
+ exit (1);
+ }
+
+ if (degree_delta == -1) {
+ if (name == PITCH_NAME_B) {
+ name = PITCH_NAME_C;
+ note->octave++;
+ } else {
+ name++;
+ }
+ switch (name) {
+ case PITCH_NAME_D:
+ case PITCH_NAME_E:
+ case PITCH_NAME_G:
+ case PITCH_NAME_A:
+ case PITCH_NAME_B:
+ accidental -= 2;
+ break;
+ case PITCH_NAME_C:
+ case PITCH_NAME_F:
+ accidental -= 1;
+ break;
+ }
+ }
+
+ if (degree_delta == +1) {
+ if (name == PITCH_NAME_C) {
+ name = PITCH_NAME_B;
+ note->octave--;
+ } else {
+ name--;
+ }
+ switch (name) {
+ case PITCH_NAME_C:
+ case PITCH_NAME_D:
+ case PITCH_NAME_F:
+ case PITCH_NAME_G:
+ case PITCH_NAME_A:
+ accidental += 2;
+ break;
+ case PITCH_NAME_E:
+ case PITCH_NAME_B:
+ accidental += 1;
+ }
+ }
+
+ if (accidental < 0 || accidental > PITCH_ACCIDENTAL_DOUBLE_SHARP) {
+ fprintf (stderr, "Internal error: Trying to adjust an accidental out of range (degree_delta == %d (%d - %d), new accidental == %d).\n", degree_delta, note_degree_zero_based, degree_zero_based, accidental);
+ exit (1);
+ }
+
+ note->pitch = PITCH (name, accidental);
+}
+
+static void
+_spell_chord_by_signature (note_group_t *chord,
+ int num_notes,
+ chord_signature_t *signature,
+ pitch_t root)
+{
+ int i, degree, note_half_steps, degree_half_steps;
+ int root_midi;
+
+ /* Sanitize root to eliminate things like double-flats,
+ * double-sharps, Cb, E#, etc. */
+ root_midi = _pitch_and_octave_to_midi (root, 0);
+ _midi_to_pitch_and_octave (root_midi, &root, NULL);
+
+ for (i = 0; i < num_notes; i++) {
+ note_half_steps = _pitch_from_root_in_half_steps (chord->notes[i]->pitch,
+ root);
+ for (degree = 0; degree < signature->num_degrees; degree++) {
+ degree_half_steps = _modified_degree_to_half_steps (&signature->degrees[degree]);
+ if (note_half_steps == degree_half_steps) {
+ scherzo_adjust_note_to_match_modified_degree (chord->notes[i],
+ root,
+ &signature->degrees[degree]);
+ break;
+ }
+ }
+ if (note_half_steps != degree_half_steps) {
+ fprintf (stderr, "Internal error: Chord and degree mis-match\n");
+ exit (1);
+ }
+ }
+}
+
+static void
+scherzo_analyze_chord (scherzo_t *scherzo)
+{
+ void *local = talloc_new (NULL);
+ analyzed_note_t *notes;
+ note_group_t *note_group;
+ unsigned i, j, num_notes;
+ int bass_pitch, inversion;
+ pitch_t root;
+ chord_signature_t *match = NULL;
+ char *chord_name;
+
+ if (scherzo->pedal_pressed)
+ note_group = &scherzo->notes_pedaled;
else
- staff = scherzo->bass;
+ note_group = &scherzo->notes_pressed;
+
+ num_notes = note_group->num_notes;
+
+ if (scherzo->chord) {
+ score_remove_chord (scherzo->chord);
+ scherzo->chord = NULL;
+ }
+
+ if (num_notes <= 1)
+ goto DONE;
+
+ notes = talloc_array (local, analyzed_note_t, num_notes);
+ if (notes == NULL)
+ goto DONE;
+
+ for (i = 0; i < num_notes; i++) {
+ score_note_t *note = note_group->notes[i];
+ notes[i].note = note;
+ notes[i].midi_pitch = _pitch_and_octave_to_midi (note->pitch,
+ note->octave);
+ /* Relative pitch will be filled in after sorting. */
+ notes[i].relative_pitch = 0;
+ }
+
+ /* First, sort by midi pitch to find the bass note. */
+ qsort (notes, num_notes, sizeof (analyzed_note_t),
+ _compare_analyzed_note_by_midi_pitch);
+
+ bass_pitch = notes[0].midi_pitch;
+
+ /* With the bass note identified, we can find all relative pitches. */
+ for (i = 0; i < num_notes; i++) {
+ notes[i].relative_pitch = notes[i].midi_pitch - bass_pitch;
+ while (notes[i].relative_pitch >= 12)
+ notes[i].relative_pitch -= 12;
+ }
+
+ /* Now, sort again by relative pitch. */
+ qsort (notes, num_notes, sizeof (analyzed_note_t),
+ _compare_analyzed_note_by_relative_pitch);
+
+ /* Finally, eliminate all duplicate notes. */
+ for (i = 0; i < num_notes - 1; i++) {
+ if (notes[i+1].relative_pitch == notes[i].relative_pitch) {
+ j = i+1;
+ while (j < num_notes &&
+ notes[j].relative_pitch == notes[i].relative_pitch)
+ {
+ j++;
+ }
+ /* The loop incremented j one past the last
+ * duplicate. Decrement so that it points to the
+ * last duplicate (and is guaranteed to not exceed
+ * the array bounds).*/
+ j--;
- _midi_to_score_pitch_and_octave (midi_note, &pitch, &octave);
+ if (j < num_notes - 1) {
+ memmove (¬es[i+1], ¬es[j+1],
+ (num_notes - j) * sizeof (analyzed_note_t));
+ }
- score_staff_add_note (staff, pitch, octave, SCORE_DURATION_WHOLE);
+ num_notes -= (j - i);
+ }
+ }
+
+ for (inversion = 0; inversion < 4; inversion++) {
+ for (i = 0; i < ARRAY_SIZE (signatures); i++) {
+ if (_chord_signature_matches (notes, num_notes,
+ signatures[i].degrees,
+ signatures[i].num_degrees,
+ inversion, &root))
+ {
+ match = &signatures[i];
+ goto HAVE_MATCH;
+ }
+ }
+ }
+HAVE_MATCH:
+
+ chord_name = (char *) signatures[i].name;
+
+ if (match) {
+ /* Don't print root pitch for octaves and inversions,
+ * (since a pitch name alone looks like a major triad) */
+ if (num_notes < 3) {
+ chord_name = talloc_strdup (local, chord_name);
+ } else {
+ chord_name = talloc_asprintf (local, "%s%s",
+ _pitch_str (root),
+ chord_name);
+ }
+
+ _spell_chord_by_signature (note_group, num_notes,
+ match, root);
+ } else {
+ chord_name = talloc_strdup (local, "?");
+ }
+
+ scherzo->chord = score_add_chord (scherzo->treble, chord_name);
+
+DONE:
+ talloc_free (local);
}
static void
-scherzo_remove_note_midi (scherzo_t *scherzo, unsigned char midi_note)
+note_group_init (void *ctx, note_group_t *group)
+{
+ group->ctx = ctx;
+ group->notes = NULL;
+ group->size = 0;
+ group->num_notes = 0;
+}
+
+static void
+note_group_add_note (note_group_t *group, score_note_t *note)
+{
+ int i;
+
+ /* Do nothing if note is already in group. */
+ for (i = 0; i < group->num_notes; i++) {
+ if (group->notes[i]->pitch == note->pitch &&
+ group->notes[i]->octave == note->octave)
+ {
+ return;
+ }
+ }
+
+ group->num_notes++;
+
+ if (group->num_notes > group->size) {
+ group->size++;
+ group->notes = talloc_realloc (group->ctx, group->notes,
+ score_note_t*, group->size);
+
+ if (group->notes == NULL) {
+ fprintf (stderr, "Out of memory.\n");
+ exit (1);
+ }
+ }
+
+ group->notes[group->num_notes - 1] = note;
+}
+
+static void
+note_group_remove_note_at (note_group_t *group, int i)
+{
+ if (i >= group->num_notes) {
+ fprintf (stderr, "Internal error: No note to remove at index %d\n", i);
+ exit (1);
+ }
+
+ if (i < group->num_notes - 1) {
+ memmove (group->notes + i, group->notes + i + 1,
+ (group->num_notes - 1 - i) * sizeof (score_note_t*));
+ }
+ group->num_notes--;
+}
+
+static score_note_t *
+scherzo_press_note (scherzo_t *scherzo, pitch_t pitch, int octave)
{
score_staff_t *staff;
- score_pitch_t pitch;
- int octave;
score_note_t *note;
+ int i;
- /* Anything at Middle C and above goes on the treble staff by default. */
- if (midi_note >= 60)
+ if (scherzo->challenge.note) {
+ staff = scherzo->challenge.staff;
+ } else if (octave >= 4) {
staff = scherzo->treble;
- else
+ } else {
staff = scherzo->bass;
+ }
+
+ /* Do nothing if this note is already pressed. */
+ for (i = 0; i < scherzo->notes_pressed.num_notes; i++) {
+ if (scherzo->notes_pressed.notes[i]->pitch == pitch &&
+ scherzo->notes_pressed.notes[i]->octave == octave)
+ {
+ return scherzo->notes_pressed.notes[i];
+ }
+ }
+
+ note = score_add_note (staff, pitch, octave, SCORE_DURATION_WHOLE);
+
+ note_group_add_note (&scherzo->notes_pressed, note);
+
+ if (scherzo->pedal_pressed)
+ note_group_add_note (&scherzo->notes_pedaled, note);
+
+ scherzo_analyze_chord (scherzo);
+
+ return note;
+}
+
+static void
+scherzo_release_note (scherzo_t *scherzo, pitch_t pitch, int octave)
+{
+ score_note_t *note;
+ int i;
+ int found = 0;
+ int target_midi = _pitch_and_octave_to_midi (pitch, octave);
+ int note_midi;
+
+ for (i = scherzo->notes_pressed.num_notes - 1; i >=0; i--) {
+ note = scherzo->notes_pressed.notes[i];
+ note_midi = _pitch_and_octave_to_midi (note->pitch, note->octave);
+ if (note_midi == target_midi) {
+ found = 1;
+ if (! scherzo->pedal_pressed)
+ score_remove_note (note);
+ note_group_remove_note_at (&scherzo->notes_pressed, i);
+ }
+ }
+
+ if (found == 0) {
+ fprintf (stderr, "Internal error: Failed to find note to release.\n");
+ }
+
+ scherzo_analyze_chord (scherzo);
+}
+
+static score_note_t *
+scherzo_press_note_midi (scherzo_t *scherzo, unsigned char midi_note)
+{
+ pitch_t pitch;
+ int octave;
+
+ _midi_to_pitch_and_octave (midi_note, &pitch, &octave);
+
+ return scherzo_press_note (scherzo, pitch, octave);
+}
+
+static void
+scherzo_release_note_midi (scherzo_t *scherzo, unsigned char midi_note)
+{
+ pitch_t pitch;
+ int octave;
+
+ _midi_to_pitch_and_octave (midi_note, &pitch, &octave);
+
+ scherzo_release_note (scherzo, pitch, octave);
+}
+
+static void
+scherzo_press_pedal (scherzo_t *scherzo)
+{
+ int i;
+
+ scherzo->pedal_pressed = 1;
+
+ /* Copy all pressed notes to pedaled notes */
+ for (i = 0; i < scherzo->notes_pressed.num_notes; i++)
+ note_group_add_note (&scherzo->notes_pedaled, scherzo->notes_pressed.notes[i]);
+}
+
+static void
+scherzo_release_pedal (scherzo_t *scherzo)
+{
+ score_note_t *note, *new_note;
+ int i;
+
+ /* Make new notes in score for all pressed notes. */
+ for (i = 0; i < scherzo->notes_pressed.num_notes; i++) {
+ note = scherzo->notes_pressed.notes[i];
+ new_note = score_add_note (note->staff, note->pitch, note->octave, note->duration);
+ scherzo->notes_pressed.notes[i] = new_note;
+ }
+
+ /* Then remove all previously pedaled notes from the score. */
+ for (i = scherzo->notes_pedaled.num_notes - 1; i >=0; i--) {
+ note = scherzo->notes_pedaled.notes[i];
+ score_remove_note (note);
+ note_group_remove_note_at (&scherzo->notes_pedaled, i);
+ }
+
+ scherzo->pedal_pressed = 0;
+
+ scherzo_analyze_chord (scherzo);
+
+ gtk_widget_queue_draw (scherzo->window);
+}
+
+void
+_select_challenge (scherzo_t *scherzo)
+{
+ category_t *category_unused;
+ bool_t introduced_unused;
+ item_t *item;
+ challenge_t *challenge = &scherzo->challenge;
+ pitch_t pitch;
+ int octave;
+ char *s;
+
+ if (challenge->note) {
+ score_remove_note (challenge->note);
+ challenge->note = NULL;
+ }
+
+ mnemon_select_item (&scherzo->mnemon,
+ &challenge->bin,
+ &challenge->item_index,
+ &category_unused,
+ &introduced_unused);
+
+ item = challenge->bin->items[challenge->item_index];
+
+ s = item->challenge;
+ if (strncmp (s, "treble:", 7) == 0) {
+ s += 7;
+ challenge->staff = scherzo->treble;
+ } else if (strncmp (s, "bass:", 5) == 0) {
+ s += 5;
+ challenge->staff = scherzo->bass;
+ } else {
+ fprintf (stderr,
+ "Malformed staff name: %s (expected 'treble:' or 'bass:')\n",
+ s);
+ exit (1);
+ }
- _midi_to_score_pitch_and_octave (midi_note, &pitch, &octave);
+ switch (*s) {
+ case 'C':
+ pitch = PITCH_NATURAL (C);
+ break;
+ case 'D':
+ pitch = PITCH_NATURAL (D);
+ break;
+ case 'E':
+ pitch = PITCH_NATURAL (E);
+ break;
+ case 'F':
+ pitch = PITCH_NATURAL (F);
+ break;
+ case 'G':
+ pitch = PITCH_NATURAL (G);
+ break;
+ case 'A':
+ pitch = PITCH_NATURAL (A);
+ break;
+ case 'B':
+ pitch = PITCH_NATURAL (B);
+ break;
+ default:
+ fprintf (stderr, "Malformed pitch name: %s (expected 'A' - 'G')\n", s);
+ exit (1);
+ }
+ s++;
+
+ if (*s < '0' || *s > '9') {
+ fprintf (stderr, "Malformed octave number: %s (expected '0' - '9')\n", s);
+ exit (1);
+ }
+
+ octave = *s - '0';
- note = score_staff_find_note (staff, pitch, octave, SCORE_DURATION_WHOLE);
- score_staff_remove_note (staff, note);
+ challenge->note = score_add_note (challenge->staff, pitch, octave,
+ SCORE_DURATION_WHOLE);
+ challenge->satisfied = 0;
+ challenge->mistaken = 0;
+}
+
+/* Determine whether the user hit the correct note. */
+static void
+_judge_note (scherzo_t *scherzo, score_note_t *note)
+{
+ challenge_t *challenge = &scherzo->challenge;
+
+ if (! scherzo->challenge.note) {
+ score_set_note_color_rgb (note, 0.0, 0.0, 0.0); /* black */
+ return;
+ }
+
+ if (note->pitch == challenge->note->pitch &&
+ note->octave == challenge->note->octave)
+ {
+ challenge->satisfied = 1;
+ score_set_note_color_rgb (note, 18/256., 130/256., 28/256.); /* green */
+ }
+ else
+ {
+ challenge->mistaken = 1;
+ score_set_note_color_rgb (note, 184/256., 4/256., 22/256.); /* red */
+ }
+}
+
+/* If the user got the right note (eventually), then score it in
+ * mnemon and show the next note. */
+static void
+_score_challenge (scherzo_t *scherzo)
+{
+ challenge_t *challenge = &scherzo->challenge;
+
+ if (! challenge->note)
+ return;
+
+ if (! challenge->satisfied)
+ return;
+
+ mnemon_score_item (&scherzo->mnemon, challenge->bin, challenge->item_index,
+ ! challenge->mistaken);
+
+ _select_challenge (scherzo);
}
static int
scherzo_t *scherzo = user_data;
ssize_t remaining;
snd_seq_event_t event;
+ score_note_t *note;
+ int need_redraw = FALSE;
remaining = read (scherzo->midi_fd, buf, MIDI_BUF_SIZE);
next, remaining, &event);
remaining -= consumed;
+ next += consumed;
switch (event.type) {
case SND_SEQ_EVENT_NONE:
/* Incomplete event. Nothing to do. */
break;
case SND_SEQ_EVENT_NOTEON:
- scherzo_add_note_midi (scherzo, event.data.note.note);
- gtk_widget_queue_draw (scherzo->window);
+ note = scherzo_press_note_midi (scherzo, event.data.note.note);
+ _judge_note (scherzo, note);
+ need_redraw = TRUE;
break;
case SND_SEQ_EVENT_NOTEOFF:
- scherzo_remove_note_midi (scherzo, event.data.note.note);
- gtk_widget_queue_draw (scherzo->window);
+ scherzo_release_note_midi (scherzo, event.data.note.note);
+ _score_challenge (scherzo);
+ need_redraw = TRUE;
break;
case SND_SEQ_EVENT_CLOCK:
/* Ignore for now as my piano sends a constant stream of these. */
case SND_SEQ_EVENT_SENSING:
/* Ignore for now as my piano sends a constant stream of these. */
break;
+ case SND_SEQ_EVENT_CONTROLLER:
+ /* XXX: My piano gives me 64 for the sustain pedal, is
+ * that universal? */
+ if (event.data.control.param == 64) {
+ if (event.data.control.value == 0)
+ scherzo_release_pedal (scherzo);
+ else
+ scherzo_press_pedal (scherzo);
+ } else {
+ fprintf (stderr, "Fixme: Unhandled MIDI Control event (param=%d, value=%d)\n",
+ event.data.control.param, event.data.control.value);
+ }
+ break;
default:
fprintf (stderr, "Fixme: Do not yet know how to handle MIDI event %d\n",
event.type);
break;
}
}
-
+
+ if (need_redraw)
+ gtk_widget_queue_draw (scherzo->window);
+
/* Return TRUE to continue to get called in the future. */
return TRUE;
}
scherzo_t scherzo;
int err;
+ srand (time (NULL));
+
gtk_init (&argc, &argv);
- scherzo.score = score_create (NULL);
- scherzo.staff_height = 48;
+ scherzo.ctx = talloc_new (NULL);
+
+ scherzo.score = score_create (scherzo.ctx);
+ scherzo.staff_height = 100;
score_set_staff_height (scherzo.score, scherzo.staff_height);
score_add_brace (scherzo.score, 2);
scherzo.treble = score_add_staff (scherzo.score, SCORE_CLEF_G);
scherzo.bass = score_add_staff (scherzo.score, SCORE_CLEF_F);
+ scherzo.chord = NULL;
+
+ /* Default to octave 4 and natural for computer keyboard keypresses. */
+ scherzo.keyboard_octave = 4;
+ scherzo.keyboard_accidental = PITCH_ACCIDENTAL_NATURAL;
+
+ note_group_init (scherzo.ctx, &scherzo.notes_pressed);
+ note_group_init (scherzo.ctx, &scherzo.notes_pedaled);
+
+ scherzo.pedal_pressed = 0;
+
+ mnemon_init (&scherzo.mnemon);
+ /* XXX: Should create a default file if one cannot be loaded. */
+ mnemon_load_category (&scherzo.mnemon, "scherzo-notes");
+
+ scherzo.challenge.note = NULL;
+/*
+ _select_challenge (&scherzo);
+*/
+
err = snd_midi_event_new (MIDI_BUF_SIZE, &scherzo.snd_midi_event);
if (err) {
fprintf (stderr, "Out of memory.\n");
scherzo.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size (GTK_WINDOW (scherzo.window), 600, 400);
+ gtk_window_set_default_size (GTK_WINDOW (scherzo.window), 1000, 600);
g_signal_connect (scherzo.window, "delete-event",
G_CALLBACK (on_delete_event_quit), NULL);
G_CALLBACK (on_expose_event_draw),
&scherzo);
- g_signal_connect (scherzo.window, "key-press-event",
+ g_signal_connect (scherzo.window, "key-press-event",
G_CALLBACK (on_key_press_event),
&scherzo);
+
+ g_signal_connect (scherzo.window, "key-release-event",
+ G_CALLBACK (on_key_release_event),
+ &scherzo);
gtk_widget_show_all (scherzo.window);
gtk_main ();
+ mnemon_save (&scherzo.mnemon);
+
snd_midi_event_free (scherzo.snd_midi_event);
- talloc_free (scherzo.score);
+
+ talloc_free (scherzo.ctx);
return 0;
}
projects / scherzo / blobdiff