X-Git-Url: https://git.cworth.org/git?p=scherzo;a=blobdiff_plain;f=scherzo.c;h=7288d5fdbe7efb98b7b4c87879b6549cbbf8f23d;hp=d1a164c76e6e9ac052faf1def3810dcf4d8681b6;hb=HEAD;hpb=bfc81675d5856cedc4bf02d412c06b98c296654e diff --git a/scherzo.c b/scherzo.c index d1a164c..7288d5f 100644 --- a/scherzo.c +++ b/scherzo.c @@ -24,7 +24,7 @@ #include "score.h" #include "mnemon.h" -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) +#define ARRAY_SIZE(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) #define unused(foo) foo __attribute__((unused)) @@ -32,22 +32,23 @@ typedef struct challenge { + int active; bin_t *bin; int item_index; score_staff_t *staff; - score_note_t *note; + pitch_t pitch; int satisfied; int mistaken; } challenge_t; -typedef struct note_group +typedef struct pitch_group { void *ctx; - score_note_t **notes; + pitch_t *pitches; int size; - int num_notes; -} note_group_t; + int num_pitches; +} pitch_group_t; typedef struct scherzo { @@ -56,6 +57,7 @@ typedef struct scherzo GtkWidget *window; score_t *score; int staff_height; + score_staff_t *treble; score_staff_t *bass; score_chord_t *chord; @@ -64,26 +66,25 @@ typedef struct scherzo * keyboard". Any "piano keyboard" key knows its own octave and * accidental already. */ int keyboard_octave; - score_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; + pitch_group_t notes_pressed; + pitch_group_t notes_pedaled; int pedal_pressed; + + scherzo_key_t key; } scherzo_t; /* Forward declarations. */ -static score_note_t * -scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave); +static void +scherzo_press_note (scherzo_t *scherzo, pitch_t pitch); static void -scherzo_release_note (scherzo_t *scherzo, score_pitch_t pitch, int octave); +scherzo_release_note (scherzo_t *scherzo, pitch_t pitch); static void scherzo_press_pedal (scherzo_t *scherzo); @@ -92,10 +93,10 @@ static void scherzo_release_pedal (scherzo_t *scherzo); static void -_judge_note (scherzo_t *scherzo, score_note_t *note); +pitch_group_remove_pitches (pitch_group_t *group); static void -_score_challenge (scherzo_t *scherzo); +scherzo_update_notes_and_chord (scherzo_t *scherzo); static int on_delete_event_quit (unused (GtkWidget *widget), @@ -147,12 +148,10 @@ on_key_press_event (GtkWidget *widget, { scherzo_t *scherzo = user_data; int octave; - /* Initialize to keep the compiler quiet. */ - score_pitch_name_t pitch_name = SCORE_PITCH_C; - score_pitch_t pitch; + pitch_t pitch = PITCH_NOT_A_PITCH; - if (scherzo->challenge.note) - octave = scherzo->challenge.note->octave; + if (scherzo->challenge.active) + octave = PITCH_OCTAVE (scherzo->challenge.pitch); else octave = scherzo->keyboard_octave; @@ -171,38 +170,89 @@ on_key_press_event (GtkWidget *widget, gtk_widget_queue_draw (widget); return TRUE; break; - case GDK_KEY_q: - case GDK_KEY_Q: case GDK_KEY_Escape: gtk_main_quit (); return FALSE; - case GDK_KEY_c: - case GDK_KEY_C: - pitch_name = SCORE_PITCH_NAME_C; + /* Map a piano keyboard onto the computer keyboard with white keys + * along the home row, (piano C on computer A, up to next octave + * higher C on computer K). Black keys are in the expected + * positions, (C# is W, D# is E, etc.). + */ + case GDK_KEY_a: + case GDK_KEY_A: + pitch = PITCH_LITERAL (C, NATURAL, octave); + break; + case GDK_KEY_s: + case GDK_KEY_S: + pitch = PITCH_LITERAL (D, NATURAL, octave); break; case GDK_KEY_d: case GDK_KEY_D: - pitch_name = SCORE_PITCH_NAME_D; - break; - case GDK_KEY_e: - case GDK_KEY_E: - pitch_name = SCORE_PITCH_NAME_E; + pitch = PITCH_LITERAL (E, NATURAL, octave); break; case GDK_KEY_f: case GDK_KEY_F: - pitch_name = SCORE_PITCH_NAME_F; + pitch = PITCH_LITERAL (F, NATURAL, octave); break; case GDK_KEY_g: case GDK_KEY_G: - pitch_name = SCORE_PITCH_NAME_G; + pitch = PITCH_LITERAL (G, NATURAL, octave); break; - case GDK_KEY_a: - case GDK_KEY_A: - pitch_name = SCORE_PITCH_NAME_A; + case GDK_KEY_h: + case GDK_KEY_H: + pitch = PITCH_LITERAL (A, NATURAL, octave); + break; + case GDK_KEY_j: + case GDK_KEY_J: + pitch = PITCH_LITERAL (B, NATURAL, octave); + break; + case GDK_KEY_k: + case GDK_KEY_K: + pitch = PITCH_LITERAL (C, NATURAL, octave + 1); + break; + case GDK_KEY_l: + case GDK_KEY_L: + pitch = PITCH_LITERAL (D, NATURAL, octave + 1); + break; + case GDK_KEY_semicolon: + case GDK_KEY_colon: + pitch = PITCH_LITERAL (E, NATURAL, octave + 1); break; - case GDK_KEY_b: - case GDK_KEY_B: - pitch_name = SCORE_PITCH_NAME_B; + case GDK_KEY_apostrophe: + case GDK_KEY_quotedbl: + pitch = PITCH_LITERAL (F, NATURAL, octave + 1); + break; + case GDK_KEY_w: + case GDK_KEY_W: + pitch = PITCH_LITERAL (C, SHARP, octave); + break; + case GDK_KEY_e: + case GDK_KEY_E: + pitch = PITCH_LITERAL (D, SHARP, octave); + break; + case GDK_KEY_t: + case GDK_KEY_T: + pitch = PITCH_LITERAL (F, SHARP, octave); + break; + case GDK_KEY_y: + case GDK_KEY_Y: + pitch = PITCH_LITERAL (G, SHARP, octave); + break; + case GDK_KEY_u: + case GDK_KEY_U: + pitch = PITCH_LITERAL (A, SHARP, octave); + break; + case GDK_KEY_o: + case GDK_KEY_O: + pitch = PITCH_LITERAL (C, SHARP, octave + 1); + break; + case GDK_KEY_p: + case GDK_KEY_P: + pitch = PITCH_LITERAL (D, SHARP, octave + 1); + break; + case GDK_KEY_bracketright: + case GDK_KEY_braceright: + pitch = PITCH_LITERAL (F, SHARP, octave + 1); break; case GDK_KEY_0: case GDK_KEY_1: @@ -218,31 +268,21 @@ on_key_press_event (GtkWidget *widget, case GDK_KEY_space: scherzo_press_pedal (scherzo); break; - case GDK_KEY_Up: - if (scherzo->keyboard_accidental < SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP) - scherzo->keyboard_accidental++; - break; - case GDK_KEY_Down: - if (scherzo->keyboard_accidental > SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT) - scherzo->keyboard_accidental--; + case GDK_KEY_Return: + /* Clear all notes when Return is pressed. */ + pitch_group_remove_pitches (&scherzo->notes_pressed); + pitch_group_remove_pitches (&scherzo->notes_pedaled); + scherzo_update_notes_and_chord (scherzo); break; } - pitch = SCORE_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)) + if (pitch != PITCH_NOT_A_PITCH) { - score_note_t *note; - - note = scherzo_press_note (scherzo, pitch, octave); - _judge_note (scherzo, note); - gtk_widget_queue_draw (scherzo->window); + scherzo_press_note (scherzo, pitch); return TRUE; } - /* Allow an unhandled event to propagate to other handlers. */ return FALSE; } @@ -254,188 +294,132 @@ on_key_release_event (unused (GtkWidget *widget), { scherzo_t *scherzo = user_data; int octave; - /* Initialize to keep the compiler quiet. */ - score_pitch_name_t pitch_name = SCORE_PITCH_NAME_C; - score_pitch_t pitch; + pitch_t pitch = PITCH_NOT_A_PITCH; - if (scherzo->challenge.note) - octave = scherzo->challenge.note->octave; + if (scherzo->challenge.active) + octave = PITCH_OCTAVE (scherzo->challenge.pitch); else octave = scherzo->keyboard_octave; switch (key->keyval) { - case GDK_KEY_c: - case GDK_KEY_C: - pitch_name = SCORE_PITCH_NAME_C; + case GDK_KEY_a: + case GDK_KEY_A: + pitch = PITCH_LITERAL (C, NATURAL, octave); + break; + case GDK_KEY_s: + case GDK_KEY_S: + pitch = PITCH_LITERAL (D, NATURAL, octave); break; case GDK_KEY_d: case GDK_KEY_D: - pitch_name = SCORE_PITCH_NAME_D; - break; - case GDK_KEY_e: - case GDK_KEY_E: - pitch_name = SCORE_PITCH_NAME_E; + pitch = PITCH_LITERAL (E, NATURAL, octave); break; case GDK_KEY_f: case GDK_KEY_F: - pitch_name = SCORE_PITCH_NAME_F; + pitch = PITCH_LITERAL (F, NATURAL, octave); break; case GDK_KEY_g: case GDK_KEY_G: - pitch_name = SCORE_PITCH_NAME_G; + pitch = PITCH_LITERAL (G, NATURAL, octave); break; - case GDK_KEY_a: - case GDK_KEY_A: - pitch_name = SCORE_PITCH_NAME_A; + case GDK_KEY_h: + case GDK_KEY_H: + pitch = PITCH_LITERAL (A, NATURAL, octave); break; - case GDK_KEY_b: - case GDK_KEY_B: - pitch_name = SCORE_PITCH_NAME_B; + case GDK_KEY_j: + case GDK_KEY_J: + pitch = PITCH_LITERAL (B, NATURAL, octave); break; - case GDK_KEY_space: - scherzo_release_pedal (scherzo); + case GDK_KEY_k: + case GDK_KEY_K: + pitch = PITCH_LITERAL (C, NATURAL, octave + 1); break; - } - - pitch = SCORE_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 -_score_pitch_and_octave_to_midi (score_pitch_t pitch, - int octave) -{ - unsigned char midi_note = 12 * (octave + 1); - - switch (SCORE_PITCH_NAME (pitch)) { - case SCORE_PITCH_NAME_C: + case GDK_KEY_l: + case GDK_KEY_L: + pitch = PITCH_LITERAL (D, NATURAL, octave + 1); break; - case SCORE_PITCH_NAME_D: - midi_note += 2; + case GDK_KEY_semicolon: + case GDK_KEY_colon: + pitch = PITCH_LITERAL (E, NATURAL, octave + 1); break; - case SCORE_PITCH_NAME_E: - midi_note += 4; + case GDK_KEY_apostrophe: + case GDK_KEY_quotedbl: + pitch = PITCH_LITERAL (F, NATURAL, octave + 1); break; - case SCORE_PITCH_NAME_F: - midi_note += 5; + case GDK_KEY_w: + case GDK_KEY_W: + pitch = PITCH_LITERAL (C, SHARP, octave); break; - case SCORE_PITCH_NAME_G: - midi_note += 7; + case GDK_KEY_e: + case GDK_KEY_E: + pitch = PITCH_LITERAL (D, SHARP, octave); break; - case SCORE_PITCH_NAME_A: - midi_note += 9; + case GDK_KEY_t: + case GDK_KEY_T: + pitch = PITCH_LITERAL (F, SHARP, octave); break; - case SCORE_PITCH_NAME_B: - midi_note += 11; + case GDK_KEY_y: + case GDK_KEY_Y: + pitch = PITCH_LITERAL (G, SHARP, octave); break; - } - - switch (SCORE_PITCH_ACCIDENTAL (pitch)) { - case SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT: - midi_note -= 2; + case GDK_KEY_u: + case GDK_KEY_U: + pitch = PITCH_LITERAL (A, SHARP, octave); break; - case SCORE_PITCH_ACCIDENTAL_FLAT: - midi_note -= 1; + case GDK_KEY_o: + case GDK_KEY_O: + pitch = PITCH_LITERAL (C, SHARP, octave + 1); break; - case SCORE_PITCH_ACCIDENTAL_NATURAL: + case GDK_KEY_p: + case GDK_KEY_P: + pitch = PITCH_LITERAL (D, SHARP, octave + 1); break; - case SCORE_PITCH_ACCIDENTAL_SHARP: - midi_note += 1; + case GDK_KEY_bracketright: + case GDK_KEY_braceright: + pitch = PITCH_LITERAL (F, SHARP, octave + 1); break; - case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP: - midi_note += 2; + case GDK_KEY_space: + scherzo_release_pedal (scherzo); break; } - return midi_note; -} - -static void -_midi_to_score_pitch_and_octave (unsigned char midi_note, - score_pitch_t *pitch, - int *octave) -{ - *octave = midi_note / 12 - 1; - - switch (midi_note % 12) + if (pitch != PITCH_NOT_A_PITCH) { - case 0: - *pitch = SCORE_PITCH_C; - break; - case 1: - *pitch = SCORE_PITCH_Cs; - break; - case 2: - *pitch = SCORE_PITCH_D; - break; - case 3: - *pitch = SCORE_PITCH_Ds; - break; - case 4: - *pitch = SCORE_PITCH_E; - break; - case 5: - *pitch = SCORE_PITCH_F; - break; - case 6: - *pitch = SCORE_PITCH_Fs; - break; - case 7: - *pitch = SCORE_PITCH_G; - break; - case 8: - *pitch = SCORE_PITCH_Gs; - break; - case 9: - *pitch = SCORE_PITCH_A; - break; - case 10: - *pitch = SCORE_PITCH_As; - break; - case 11: - *pitch = SCORE_PITCH_B; - break; + scherzo_release_note (scherzo, pitch); + + return TRUE; } + + + /* Allow an unhandled event to propagate to other handlers. */ + return FALSE; } /* Determine a chord name (if any) from the current notes pressed */ -typedef struct analyzed_note { +typedef struct analyzed_pitch { /* Original note being analzyed. */ - score_note_t *note; + pitch_t pitch; /* Absolute pitch (expressed as midi number). */ int midi_pitch; /* Pitch relative to bass note. */ int relative_pitch; -} analyzed_note_t; +} analyzed_pitch_t; static int -_compare_analyzed_note_by_midi_pitch (const void *va, const void *vb) +_compare_analyzed_pitch_by_midi_pitch (const void *va, const void *vb) { - const analyzed_note_t *a = va, *b = vb; + const analyzed_pitch_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) +_compare_analyzed_pitch_by_relative_pitch (const void *va, const void *vb) { - const analyzed_note_t *a = va, *b = vb; + const analyzed_pitch_t *a = va, *b = vb; return a->relative_pitch - b->relative_pitch; } @@ -450,10 +434,15 @@ 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 scaled. */ - switch (degree->degree) { + * diatonic scale. */ + switch (scale_degree) { case 1: half_steps = 0; break; @@ -485,20 +474,20 @@ _modified_degree_to_half_steps (const modified_degree_t *degree) } static int -_chord_signature_matches (analyzed_note_t *notes, - int num_notes, +_chord_signature_matches (analyzed_pitch_t *pitches, + int num_pitches, modified_degree_t *degrees, int num_degrees, int inversion, - score_pitch_t *root) + pitch_t *root) { -#define MAX_DEGREES 4 +#define MAX_DEGREES 6 int relative_pitches[MAX_DEGREES]; int i, root_index; assert (num_degrees <= MAX_DEGREES); - if (num_notes != num_degrees) + if (num_pitches != num_degrees) return 0; if (inversion >= num_degrees) @@ -521,131 +510,22 @@ _chord_signature_matches (analyzed_note_t *notes, } - for (i = 0; i < num_notes; i++) - if (notes[i].relative_pitch != relative_pitches[i]) + for (i = 0; i < num_pitches; i++) + if (pitches[i].relative_pitch != relative_pitches[i]) return 0; - root_index = (num_notes - inversion) % num_notes; - *root = notes[root_index].note->pitch; + root_index = (num_pitches - inversion) % num_pitches; + *root = pitches[root_index].pitch; return 1; } -static const char * -_pitch_str (score_pitch_t pitch) -{ - switch (pitch) { - case SCORE_PITCH_Cff: - return "C𝄫"; - case SCORE_PITCH_Cf: - return "C♭"; - case SCORE_PITCH_C: - return "C"; - case SCORE_PITCH_Cs: - return "C♯"; - case SCORE_PITCH_Css: - return "C𝄪"; - case SCORE_PITCH_Dff: - return "D𝄫"; - case SCORE_PITCH_Df: - return "D♭"; - case SCORE_PITCH_D: - return "D"; - case SCORE_PITCH_Ds: - return "D♯"; - case SCORE_PITCH_Dss: - return "D𝄪"; - case SCORE_PITCH_Eff: - return "E𝄫"; - case SCORE_PITCH_Ef: - return "E♭"; - case SCORE_PITCH_E: - return "E"; - case SCORE_PITCH_Es: - return "E♯"; - case SCORE_PITCH_Ess: - return "E𝄪"; - case SCORE_PITCH_Fff: - return "F𝄫"; - case SCORE_PITCH_Ff: - return "F♭"; - case SCORE_PITCH_F: - return "F"; - case SCORE_PITCH_Fs: - return "F♯"; - case SCORE_PITCH_Fss: - return "F𝄪"; - case SCORE_PITCH_Gff: - return "G𝄫"; - case SCORE_PITCH_Gf: - return "G♭"; - case SCORE_PITCH_G: - return "G"; - case SCORE_PITCH_Gs: - return "G♯"; - case SCORE_PITCH_Gss: - return "G𝄪"; - case SCORE_PITCH_Aff: - return "A𝄫"; - case SCORE_PITCH_Af: - return "A♭"; - case SCORE_PITCH_A: - return "A"; - case SCORE_PITCH_As: - return "A♯"; - case SCORE_PITCH_Ass: - return "A𝄪"; - case SCORE_PITCH_Bff: - return "B𝄫"; - case SCORE_PITCH_Bf: - return "B♭"; - case SCORE_PITCH_B: - return "B"; - case SCORE_PITCH_Bs: - return "B♯"; - case SCORE_PITCH_Bss: - return "B𝄪"; - } - - fprintf (stderr, "Internal error: Unknown pitch %d\n", pitch); - exit (1); -} - -static void -scherzo_analyze_chord (scherzo_t *scherzo) +typedef struct chord_signature { - void *local = talloc_new (NULL); - analyzed_note_t *notes; - note_group_t *note_group; - unsigned i, j, num_notes; - int bass_pitch, inversion; - score_pitch_t root; - const char *chord_name = NULL; - - if (scherzo->pedal_pressed) - note_group = &scherzo->notes_pedaled; - else - note_group = &scherzo->notes_pressed; - - num_notes = note_group->num_notes; - - struct { modified_degree_t degrees[1]; const char *name; } octaves[] = { - { {{1, 0}}, " Octave"} - }; - - struct { modified_degree_t degrees[2]; const char *name; } intervals[] = { - { {{1, 0}, {2, -1}}, " Minor 2nd"}, - { {{1, 0}, {2, 0}}, " Major 2nd"}, - { {{1, 0}, {3, -1}}, " Minor 3rd"}, - { {{1, 0}, {3, 0}}, " Major 3rd"}, - { {{1, 0}, {4, 0}}, " Perfect 4th"}, - { {{1, 0}, {5, -1}}, " Diminished 5th"}, - { {{1, 0}, {5, 0}}, " Perfect 5th"}, - { {{1, 0}, {6, -1}}, " Minor 6th"}, - { {{1, 0}, {6, 0}}, " Major 6th"}, - { {{1, 0}, {7, -1}}, " Minor 7th"}, - { {{1, 0}, {7, 0}}, " Major 7th"} - }; + 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: @@ -660,74 +540,216 @@ scherzo_analyze_chord (scherzo_t *scherzo) #define SUP "" #define PUS "" - struct { modified_degree_t degrees[3]; const char *name; } triads[] = { - { {{1, 0}, {3, 0}, {5, +1}}, SUP "+" PUS }, - { {{1, 0}, {3, 0}, {5, 0}}, "" }, - { {{1, 0}, {3, -1}, {5, 0}}, "m" }, - { {{1, 0}, {3, -1}, {5, -1}}, "°" } - }; - - struct { modified_degree_t degrees[4]; const char *name; } tetrachords[] = { - /* Sixth chords */ - { {{1, 0}, {3, 0}, {5, 0}, {6, 0}}, "6" }, - { {{1, 0}, {3, -1}, {5, 0}, {6, 0}}, "m6" }, - /* Seventh chords */ - { {{1, 0}, {3, 0}, {5, +1}, {7, 0}}, SUP "+M7" PUS }, - { {{1, 0}, {3, 0}, {5, +1}, {7, -1}}, SUP "+7" PUS }, - { {{1, 0}, {3, 0}, {5, 0}, {7, 0}}, "M7" }, - { {{1, 0}, {3, 0}, {5, 0}, {7, -1}}, "7" }, - { {{1, 0}, {3, 0}, {5, -1}, {7, -1}}, SUP "7♭5" PUS }, - { {{1, 0}, {3, -1}, {5, 0}, {7, 0}}, "m" SUP "M7" PUS }, - { {{1, 0}, {3, -1}, {5, 0}, {7, -1}}, "m7" }, - { {{1, 0}, {3, -1}, {5, -1}, {7, 0}}, "°" SUP "M7" PUS }, - { {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "𝆩" SUP "7" PUS }, - { {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "°" SUP "7" PUS } - }; +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 } +}; - if (scherzo->chord) { - score_remove_chord (scherzo->chord); - scherzo->chord = NULL; +static void +_spell_chord_by_signature (pitch_group_t *chord, + chord_signature_t *signature, + pitch_t root) +{ + int i, degree, note_half_steps, degree_half_steps; + + for (i = 0; i < chord->num_pitches; i++) { + note_half_steps = pitch_from_root_in_half_steps (chord->pitches[i], + 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) { + chord->pitches[i] = pitch_spell_as_degree (chord->pitches[i], + root, + signature->degrees[degree].degree); + break; + } + } + if (note_half_steps != degree_half_steps) { + fprintf (stderr, "Internal error: Chord and degree mis-match\n"); + exit (1); + } } +} - if (num_notes <= 1) +static void +_analyze_chord (pitch_group_t *chord, + chord_signature_t **signature_ret, + pitch_t **root_ret) +{ + void *local = talloc_new (NULL); + analyzed_pitch_t *pitches; + int i, j, num_pitches; + int bass_pitch, inversion; + pitch_t root; + chord_signature_t *match = NULL; + + /* Default to no-match for any early return */ + *signature_ret = NULL; + *root_ret = NULL; + + num_pitches = chord->num_pitches; + + if (chord->num_pitches <= 1) goto DONE; - notes = talloc_array (local, analyzed_note_t, num_notes); - if (notes == NULL) + pitches = talloc_array (local, analyzed_pitch_t, num_pitches); + if (pitches == 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 = _score_pitch_and_octave_to_midi (note->pitch, - note->octave); + for (i = 0; i < num_pitches; i++) { + pitch_t pitch = chord->pitches[i]; + pitches[i].pitch = pitch; + pitches[i].midi_pitch = pitch_to_midi (pitch); /* Relative pitch will be filled in after sorting. */ - notes[i].relative_pitch = 0; + pitches[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); + qsort (pitches, num_pitches, sizeof (analyzed_pitch_t), + _compare_analyzed_pitch_by_midi_pitch); - bass_pitch = notes[0].midi_pitch; + bass_pitch = pitches[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; + for (i = 0; i < num_pitches; i++) { + pitches[i].relative_pitch = pitches[i].midi_pitch - bass_pitch; + while (pitches[i].relative_pitch >= 12) + pitches[i].relative_pitch -= 12; } /* Now, sort again by relative pitch. */ - qsort (notes, num_notes, sizeof (analyzed_note_t), - _compare_analyzed_note_by_relative_pitch); + qsort (pitches, num_pitches, sizeof (analyzed_pitch_t), + _compare_analyzed_pitch_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) { + for (i = 0; i < num_pitches - 1; i++) { + if (pitches[i+1].relative_pitch == pitches[i].relative_pitch) { j = i+1; - while (j < num_notes && - notes[j].relative_pitch == notes[i].relative_pitch) + while (j < num_pitches && + pitches[j].relative_pitch == pitches[i].relative_pitch) { j++; } @@ -737,235 +759,286 @@ scherzo_analyze_chord (scherzo_t *scherzo) * the array bounds).*/ j--; - if (j < num_notes - 1) { - memmove (¬es[i+1], ¬es[j+1], - (num_notes - j) * sizeof (analyzed_note_t)); + if (j < num_pitches - 1) { + memmove (&pitches[i+1], &pitches[j+1], + (num_pitches - j) * sizeof (analyzed_pitch_t)); } - num_notes -= (j - i); + num_pitches -= (j - i); } } for (inversion = 0; inversion < 4; inversion++) { - switch (num_notes) { - case 1: - for (i = 0; i < ARRAY_SIZE (octaves); i++) { - if (_chord_signature_matches (notes, num_notes, - octaves[i].degrees, 1, - inversion, &root)) - { - chord_name = octaves[i].name; - goto CHORD_NAME_KNOWN; - } + for (i = 0; i < ARRAY_SIZE (signatures); i++) { + if (_chord_signature_matches (pitches, num_pitches, + signatures[i].degrees, + signatures[i].num_degrees, + inversion, &root)) + { + match = &signatures[i]; + goto HAVE_MATCH; } - break; - case 2: - for (i = 0; i < ARRAY_SIZE (intervals); i++) { - if (_chord_signature_matches (notes, num_notes, - intervals[i].degrees, 2, - inversion, &root)) - { - chord_name = intervals[i].name; - goto CHORD_NAME_KNOWN; - } - } - break; - case 3: - for (i = 0; i < ARRAY_SIZE (triads); i++) { - if (_chord_signature_matches (notes, num_notes, - triads[i].degrees, 3, - inversion, &root)) - { - chord_name = triads[i].name; - goto CHORD_NAME_KNOWN; - } - } - break; - case 4: - for (i = 0; i < ARRAY_SIZE(tetrachords); i++) { - if (_chord_signature_matches (notes, num_notes, - tetrachords[i].degrees, 4, - inversion, &root)) - { - chord_name = tetrachords[i].name; - goto CHORD_NAME_KNOWN; - } - } - break; } } - CHORD_NAME_KNOWN: - - if (chord_name) { - if (inversion) { - const char *inversion_str; - switch (inversion) { - case 1: - inversion_str = "1st inversion"; - break; - case 2: - inversion_str = "2nd inversion"; - break; - case 3: - inversion_str = "3rd inversion"; +HAVE_MATCH: + + if (match) { + *signature_ret = match; + for (i = 0; i < chord->num_pitches; i++) { + if (chord->pitches[i] == root) { + *root_ret = &chord->pitches[i]; break; - default: - fprintf (stderr, "Internal error: Unexpected inversion: %d\n", - inversion); - exit(1); } - chord_name = talloc_asprintf (local, "%s%s %s", - _pitch_str (root), - chord_name, inversion_str); - } else { - chord_name = talloc_asprintf (local, "%s%s", - _pitch_str (root), - chord_name); } - } else { - chord_name = talloc_strdup (local, "Unknown chord"); } - scherzo->chord = score_add_chord (scherzo->treble, chord_name); - DONE: talloc_free (local); } static void -note_group_init (void *ctx, note_group_t *group) +pitch_group_init (void *ctx, pitch_group_t *group) { group->ctx = ctx; - group->notes = NULL; + group->pitches = NULL; group->size = 0; - group->num_notes = 0; + group->num_pitches = 0; } static void -note_group_add_note (note_group_t *group, score_note_t *note) +pitch_group_add_pitch (pitch_group_t *group, pitch_t pitch) { 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) - { + /* Do nothing if pitch is already in group. */ + for (i = 0; i < group->num_pitches; i++) + if (group->pitches[i] == pitch) return; - } - } - group->num_notes++; + group->num_pitches++; - if (group->num_notes > group->size) { + if (group->num_pitches > group->size) { group->size++; - group->notes = talloc_realloc (group->ctx, group->notes, - score_note_t*, group->size); + group->pitches = talloc_realloc (group->ctx, group->pitches, + pitch_t, group->size); - if (group->notes == NULL) { + if (group->pitches == NULL) { fprintf (stderr, "Out of memory.\n"); exit (1); } } - group->notes[group->num_notes - 1] = note; + group->pitches[group->num_pitches - 1] = pitch; } static void -note_group_remove_note_at (note_group_t *group, int i) +pitch_group_remove_pitch_at (pitch_group_t *group, int i) { - if (i >= group->num_notes) { - fprintf (stderr, "Internal error: No note to remove at index %d\n", i); + if (i > group->num_pitches) { + fprintf (stderr, "Internal error: Cannot remove pitch %d from group with only %d %s\n", + i, group->num_pitches, + group->num_pitches == 1 ? "pitch" : "pitches"); 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*)); + if (i < group->num_pitches - 1) { + memmove (group->pitches + i, group->pitches + i + 1, + (group->num_pitches - 1 - i) * sizeof (pitch_t)); } - group->num_notes--; + + group->num_pitches--; } -static score_note_t * -scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) +/* Remove a 'pitch' from 'group', (including any enharmonic pitch) + * See also: pitch_group_remove_pitch + */ +static void +pitch_group_remove_pitch_enharmonic (pitch_group_t *group, pitch_t pitch) { - score_staff_t *staff; - score_note_t *note; int i; - if (scherzo->challenge.note) { - staff = scherzo->challenge.staff; - } else if (octave >= 4) { - staff = scherzo->treble; - } else { - staff = scherzo->bass; - } + for (i = 0; i < group->num_pitches; i++) + if (pitch_enharmonic_to (group->pitches[i], pitch)) + pitch_group_remove_pitch_at (group, i); +} - /* 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]; +/* Remove an exactly-matching pitch from 'group' + * See also: pitch_group_remove_pitch_enharmonic + * +static void +pitch_group_remove_pitch (pitch_group_t *group, pitch_t pitch) +{ + int i; + + for (i = 0; i < group->num_pitches; i++) + if (group->pitches[i] == pitch) + pitch_group_remove_pitch_at (group, i); +} +*/ + +/* Remove all pitches from a pitch_group_t */ +static void +pitch_group_remove_pitches (pitch_group_t *group) +{ + talloc_free (group->pitches); + pitch_group_init (group->ctx, group); +} + +static void +scherzo_update_notes_and_chord (scherzo_t *scherzo) +{ + void *local = talloc_new (NULL); + pitch_group_t *chord; + chord_signature_t *signature; + char *chord_name = NULL; + pitch_t *root; + int i; + + /* Remove all notes/chords from score, then add current notes. */ + score_remove_notes (scherzo->score); + score_remove_chords (scherzo->score); + + if (scherzo->pedal_pressed) + chord = &scherzo->notes_pedaled; + else + chord = &scherzo->notes_pressed; + + _analyze_chord (chord, &signature, &root); + + if (signature) { + /* Don't print root pitch for octaves and inversions, + * (since a pitch name alone looks like a major triad) */ + if (signature->num_degrees < 3) { + /* In fact, don't print anything for octaves and + * inversions for now. It leads to a bit of flashing when + * playing chords. + * + * FIXME: What I'd like to have here is a small timeout, + * such that names only appear once an interval has been + * held for at least 100 ms or so. With that, it would be + * nice to display the interval names once again. + * + chord_name = talloc_strdup (local, signature->name); + */ + } else { + _spell_chord_by_signature (&scherzo->notes_pressed, + signature, *root); + _spell_chord_by_signature (&scherzo->notes_pedaled, + signature, *root); + + chord_name = talloc_asprintf (local, "%s%s", + pitch_string (*root), + signature->name); } + } else if (chord->num_pitches > 2) { + chord_name = talloc_strdup (local, "?"); } - note = score_add_note (staff, pitch, octave, SCORE_DURATION_WHOLE); + if (chord_name) + scherzo->chord = score_add_chord (scherzo->treble, chord_name); - note_group_add_note (&scherzo->notes_pressed, note); + for (i = 0; i < scherzo->notes_pressed.num_pitches; i++) + { + score_add_note (scherzo->score, scherzo->notes_pressed.pitches[i], + SCORE_DURATION_WHOLE); + } - if (scherzo->pedal_pressed) - note_group_add_note (&scherzo->notes_pedaled, note); + for (i = 0; i < scherzo->notes_pedaled.num_pitches; i++) + { + score_add_note (scherzo->score, scherzo->notes_pedaled.pitches[i], + SCORE_DURATION_WHOLE); + } - scherzo_analyze_chord (scherzo); + gtk_widget_queue_draw (scherzo->window); - return note; + talloc_free (local); } static void -scherzo_release_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) +scherzo_set_key (scherzo_t *scherzo, pitch_t pitch) +{ + scherzo_key_init (&scherzo->key, pitch); + score_set_key (scherzo->score, pitch); +} + +static bool +pitches_are_diatonic_scale (pitch_t *pitches, int num_pitches) { - score_note_t *note; + int diatonic_half_steps[7] = { + 0, 2, 4, 5, 7, 9, 11 + }; + int half_steps; + pitch_t root; int i; - int found = 0; - - for (i = scherzo->notes_pressed.num_notes - 1; i >=0; i--) { - note = scherzo->notes_pressed.notes[i]; - if (note->pitch == pitch && note->octave == octave) { - found = 1; - if (! scherzo->pedal_pressed) - score_remove_note (note); - note_group_remove_note_at (&scherzo->notes_pressed, i); - } + + if (num_pitches < 7) + return 0; + + root = pitches[0]; + + for (i = 0; i < 7; i++) { + half_steps = pitch_from_root_in_half_steps (pitches[i], root); + if (half_steps != diatonic_half_steps[i]) + return false; } - if (found == 0) { - fprintf (stderr, "Internal error: Failed to find note to release.\n"); + return true; +} + +static void +scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) +{ + int i; + + pitch = scherzo_key_spell_pitch (&scherzo->key, pitch); + +#define NUM_RECENT_PITCHES 7 + static pitch_t recent_pitches[NUM_RECENT_PITCHES]; + + memmove (recent_pitches, recent_pitches + 1, + (NUM_RECENT_PITCHES - 1) * sizeof (pitch_t)); + recent_pitches[NUM_RECENT_PITCHES - 1] = pitch; + + if (pitches_are_diatonic_scale (recent_pitches, NUM_RECENT_PITCHES)) { + scherzo_set_key (scherzo, recent_pitches[0]); + + /* Respell pitch according to new key. */ + pitch = scherzo_key_spell_pitch (&scherzo->key, pitch); } - scherzo_analyze_chord (scherzo); + /* Do nothing if this note is already pressed. */ + for (i = 0; i < scherzo->notes_pressed.num_pitches; i++) + if (scherzo->notes_pressed.pitches[i] == pitch) + return; + + pitch_group_add_pitch (&scherzo->notes_pressed, pitch); + + if (scherzo->pedal_pressed) + pitch_group_add_pitch (&scherzo->notes_pedaled, pitch); + + scherzo_update_notes_and_chord (scherzo); } -static score_note_t * -scherzo_press_note_midi (scherzo_t *scherzo, unsigned char midi_note) +static void +scherzo_release_note (scherzo_t *scherzo, pitch_t pitch) { - score_pitch_t pitch; - int octave; + pitch = scherzo_key_spell_pitch (&scherzo->key, pitch); - _midi_to_score_pitch_and_octave (midi_note, &pitch, &octave); + pitch_group_remove_pitch_enharmonic (&scherzo->notes_pressed, pitch); - return scherzo_press_note (scherzo, pitch, octave); + scherzo_update_notes_and_chord (scherzo); } static void -scherzo_release_note_midi (scherzo_t *scherzo, unsigned char midi_note) +scherzo_press_note_midi (scherzo_t *scherzo, unsigned char midi_note) { - score_pitch_t pitch; - int octave; - - _midi_to_score_pitch_and_octave (midi_note, &pitch, &octave); + scherzo_press_note (scherzo, pitch_from_midi (midi_note)); +} - scherzo_release_note (scherzo, pitch, octave); +static void +scherzo_release_note_midi (scherzo_t *scherzo, unsigned char midi_note) +{ + scherzo_release_note (scherzo, pitch_from_midi (midi_note)); } static void @@ -973,56 +1046,45 @@ scherzo_press_pedal (scherzo_t *scherzo) { int i; + if (scherzo->pedal_pressed) + return; + 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]); + for (i = 0; i < scherzo->notes_pressed.num_pitches; i++) + pitch_group_add_pitch (&scherzo->notes_pedaled, scherzo->notes_pressed.pitches[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; - } + if (! scherzo->pedal_pressed) + return; - /* 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); - } + /* Remove all previously pedaled notes. */ + for (i = scherzo->notes_pedaled.num_pitches - 1; i >=0; i--) + pitch_group_remove_pitch_at (&scherzo->notes_pedaled, i); scherzo->pedal_pressed = 0; - scherzo_analyze_chord (scherzo); - - gtk_widget_queue_draw (scherzo->window); + scherzo_update_notes_and_chord (scherzo); } -void +#if 0 +static void _select_challenge (scherzo_t *scherzo) { category_t *category_unused; bool_t introduced_unused; item_t *item; challenge_t *challenge = &scherzo->challenge; - score_pitch_t pitch; + pitch_name_t pitch_name; 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, @@ -1047,25 +1109,25 @@ _select_challenge (scherzo_t *scherzo) switch (*s) { case 'C': - pitch = SCORE_PITCH_C; + pitch_name = PITCH_NAME_C; break; case 'D': - pitch = SCORE_PITCH_D; + pitch_name = PITCH_NAME_D; break; case 'E': - pitch = SCORE_PITCH_E; + pitch_name = PITCH_NAME_E; break; case 'F': - pitch = SCORE_PITCH_F; + pitch_name = PITCH_NAME_F; break; case 'G': - pitch = SCORE_PITCH_G; + pitch_name = PITCH_NAME_G; break; case 'A': - pitch = SCORE_PITCH_A; + pitch_name = PITCH_NAME_A; break; case 'B': - pitch = SCORE_PITCH_B; + pitch_name = PITCH_NAME_B; break; default: fprintf (stderr, "Malformed pitch name: %s (expected 'A' - 'G')\n", s); @@ -1080,34 +1142,26 @@ _select_challenge (scherzo_t *scherzo) octave = *s - '0'; - challenge->note = score_add_note (challenge->staff, pitch, octave, - SCORE_DURATION_WHOLE); + challenge->pitch = PITCH (pitch_name, PITCH_ACCIDENTAL_NATURAL, octave); + + challenge->active = 1; 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) +_judge_pitch (scherzo_t *scherzo, pitch_t pitch) { challenge_t *challenge = &scherzo->challenge; - if (! scherzo->challenge.note) { - score_set_note_color_rgb (note, 0.0, 0.0, 0.0); /* black */ + if (! challenge->active) return; - } - if (note->pitch == challenge->note->pitch && - note->octave == challenge->note->octave) - { + if (pitch == challenge->pitch) 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 @@ -1117,7 +1171,7 @@ _score_challenge (scherzo_t *scherzo) { challenge_t *challenge = &scherzo->challenge; - if (! challenge->note) + if (! challenge->active) return; if (! challenge->satisfied) @@ -1128,20 +1182,27 @@ _score_challenge (scherzo_t *scherzo) _select_challenge (scherzo); } +#endif + +typedef struct +{ + scherzo_t *scherzo; + int fd; +} scherzo_midi_closure_t; static int on_midi_input (unused (GIOChannel *channel), unused (GIOCondition condition), void *user_data) { + scherzo_midi_closure_t *closure = user_data; unsigned char buf[MIDI_BUF_SIZE], *next; - scherzo_t *scherzo = user_data; + scherzo_t *scherzo = closure->scherzo; + int fd = closure->fd; 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); + remaining = read (fd, buf, MIDI_BUF_SIZE); next = buf; while (remaining) { @@ -1158,14 +1219,10 @@ on_midi_input (unused (GIOChannel *channel), /* Incomplete event. Nothing to do. */ break; case SND_SEQ_EVENT_NOTEON: - note = scherzo_press_note_midi (scherzo, event.data.note.note); - _judge_note (scherzo, note); - need_redraw = TRUE; + scherzo_press_note_midi (scherzo, event.data.note.note); break; case SND_SEQ_EVENT_NOTEOFF: 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. */ @@ -1193,18 +1250,42 @@ on_midi_input (unused (GIOChannel *channel), } } - if (need_redraw) - gtk_widget_queue_draw (scherzo->window); - /* Return TRUE to continue to get called in the future. */ return TRUE; } +static void * +listen_to_alsa_midi (void *data) +{ + scherzo_midi_closure_t *closure = data; + int out_fd = closure->fd; + snd_rawmidi_t *midi_in; + unsigned char buf[MIDI_BUF_SIZE]; + ssize_t bytes; + int err; + + err = snd_rawmidi_open (&midi_in, NULL, "virtual", 0); + if (err) { + fprintf (stderr, "Failed to open virtual MIDI handle."); + return NULL; + } + + while (1) { + bytes = snd_rawmidi_read (midi_in, buf, MIDI_BUF_SIZE); + write (out_fd, buf, bytes); + } + + return NULL; +} + int main (int argc, char *argv[]) { GtkWidget *drawing_area; + GIOChannel *channel; scherzo_t scherzo; + int alsa_midi_fd[2]; + scherzo_midi_closure_t midi_out, alsa_midi_in, alsa_midi_out; int err; srand (time (NULL)); @@ -1223,20 +1304,22 @@ main (int argc, char *argv[]) scherzo.chord = NULL; - /* Default to octave 4 and natural for computer keyboard keypresses. */ + /* Default to octave 4 for computer keyboard keypresses. */ scherzo.keyboard_octave = 4; - scherzo.keyboard_accidental = SCORE_PITCH_ACCIDENTAL_NATURAL; - note_group_init (scherzo.ctx, &scherzo.notes_pressed); - note_group_init (scherzo.ctx, &scherzo.notes_pedaled); + pitch_group_init (scherzo.ctx, &scherzo.notes_pressed); + pitch_group_init (scherzo.ctx, &scherzo.notes_pedaled); scherzo.pedal_pressed = 0; + /* Default to key of C Major, naturally. */ + scherzo_set_key (&scherzo, PITCH_CLASS_LITERAL (C, NATURAL)); + 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; + scherzo.challenge.active = 0; /* _select_challenge (&scherzo); */ @@ -1248,17 +1331,29 @@ main (int argc, char *argv[]) } #define MIDI_DEVICE "/dev/midi1" - scherzo.midi_fd = open (MIDI_DEVICE, O_RDONLY); - if (scherzo.midi_fd < 0) { - printf ("failed to open " MIDI_DEVICE ". Midi input will not be available.\n"); - } else { - GIOChannel *channel; - channel = g_io_channel_unix_new (scherzo.midi_fd); + midi_out.scherzo = &scherzo; + midi_out.fd = open (MIDI_DEVICE, O_RDONLY); + if (midi_out.fd < 0) { + printf ("Failed to open " MIDI_DEVICE ". You will need to connect a MIDI device.\n"); + } else { + channel = g_io_channel_unix_new (midi_out.fd); g_io_channel_set_encoding (channel, NULL, NULL); - g_io_add_watch (channel, G_IO_IN, on_midi_input, &scherzo); + g_io_add_watch (channel, G_IO_IN, on_midi_input, &midi_out); } + pipe (alsa_midi_fd); + + alsa_midi_in.scherzo = &scherzo; + alsa_midi_in.fd = alsa_midi_fd[1]; + g_thread_new ("scherzo-vmidi", listen_to_alsa_midi, &alsa_midi_in); + + alsa_midi_out.scherzo = &scherzo; + alsa_midi_out.fd = alsa_midi_fd[0]; + channel = g_io_channel_unix_new (alsa_midi_out.fd); + g_io_channel_set_encoding (channel, NULL, NULL); + g_io_add_watch (channel, G_IO_IN, on_midi_input, &alsa_midi_out); + scherzo.window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (scherzo.window), 1000, 600);