X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=d6b3af55f8d56cf6dee4cc2fde49ae1c65fc4d59;hb=73ba6a9e9a9308747fd0fa301e1a349746eaf47c;hp=d7f78fdf6f372ba4b94d5020deeaba4547bea5e7;hpb=ce792186e7f6f467c7122a7ea423d2193a30569a;p=scherzo diff --git a/scherzo.c b/scherzo.c index d7f78fd..d6b3af5 100644 --- a/scherzo.c +++ b/scherzo.c @@ -60,9 +60,11 @@ typedef struct scherzo score_staff_t *bass; score_chord_t *chord; - /* This is for a "computer keyboard". Any "piano keyboard" key - * knows its own octave. */ + /* The word "keyboard" here is referring to a "computer + * 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; @@ -145,6 +147,7 @@ on_key_press_event (GtkWidget *widget, { scherzo_t *scherzo = user_data; int octave; + score_pitch_name_t pitch_name; score_pitch_t pitch; if (scherzo->challenge.note) @@ -174,31 +177,31 @@ on_key_press_event (GtkWidget *widget, return FALSE; case GDK_KEY_c: case GDK_KEY_C: - pitch = SCORE_PITCH_C; + pitch_name = SCORE_PITCH_NAME_C; break; case GDK_KEY_d: case GDK_KEY_D: - pitch = SCORE_PITCH_D; + pitch_name = SCORE_PITCH_NAME_D; break; case GDK_KEY_e: case GDK_KEY_E: - pitch = SCORE_PITCH_E; + pitch_name = SCORE_PITCH_NAME_E; break; case GDK_KEY_f: case GDK_KEY_F: - pitch = SCORE_PITCH_F; + pitch_name = SCORE_PITCH_NAME_F; break; case GDK_KEY_g: case GDK_KEY_G: - pitch = SCORE_PITCH_G; + pitch_name = SCORE_PITCH_NAME_G; break; case GDK_KEY_a: case GDK_KEY_A: - pitch = SCORE_PITCH_A; + pitch_name = SCORE_PITCH_NAME_A; break; case GDK_KEY_b: case GDK_KEY_B: - pitch = SCORE_PITCH_B; + pitch_name = SCORE_PITCH_NAME_B; break; case GDK_KEY_0: case GDK_KEY_1: @@ -214,8 +217,18 @@ 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--; + 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)) { @@ -240,6 +253,7 @@ on_key_release_event (unused (GtkWidget *widget), { scherzo_t *scherzo = user_data; int octave; + score_pitch_name_t pitch_name; score_pitch_t pitch; if (scherzo->challenge.note) @@ -250,37 +264,39 @@ on_key_release_event (unused (GtkWidget *widget), switch (key->keyval) { case GDK_KEY_c: case GDK_KEY_C: - pitch = SCORE_PITCH_C; + pitch_name = SCORE_PITCH_NAME_C; break; case GDK_KEY_d: case GDK_KEY_D: - pitch = SCORE_PITCH_D; + pitch_name = SCORE_PITCH_NAME_D; break; case GDK_KEY_e: case GDK_KEY_E: - pitch = SCORE_PITCH_E; + pitch_name = SCORE_PITCH_NAME_E; break; case GDK_KEY_f: case GDK_KEY_F: - pitch = SCORE_PITCH_F; + pitch_name = SCORE_PITCH_NAME_F; break; case GDK_KEY_g: case GDK_KEY_G: - pitch = SCORE_PITCH_G; + pitch_name = SCORE_PITCH_NAME_G; break; case GDK_KEY_a: case GDK_KEY_A: - pitch = SCORE_PITCH_A; + pitch_name = SCORE_PITCH_NAME_A; break; case GDK_KEY_b: case GDK_KEY_B: - pitch = SCORE_PITCH_B; + pitch_name = SCORE_PITCH_NAME_B; break; case GDK_KEY_space: scherzo_release_pedal (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)) { @@ -422,22 +438,100 @@ _compare_analyzed_note_by_relative_pitch (const void *va, const void *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; + + /* Number of half steps from root to specified degree within a + * diatonic scaled. */ + switch (degree->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; +} + static int _chord_signature_matches (analyzed_note_t *notes, int num_notes, - int *signature_pitches, - int num_signature_pitches) + modified_degree_t *degrees, + int num_degrees, + int *inversion_ret) { +#define MAX_DEGREES 4 + int relative_pitches[MAX_DEGREES]; + int inversion, max_inversions; int i; - if (num_notes != num_signature_pitches) - return 0; + assert (num_degrees <= MAX_DEGREES); - for (i = 0; i < num_notes; i++) - if (notes[i].relative_pitch != signature_pitches[i]) + if (num_notes != num_degrees) return 0; - return 1; + max_inversions = num_degrees; + + /* We never spell simple intervals as inversions. */ + if (num_degrees == 2) + max_inversions = 1; + + for (inversion = 0; inversion < max_inversions; inversion++) { + 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]) + goto NEXT_INVERSION; + + *inversion_ret = inversion; + + return 1; + + NEXT_INVERSION: + ; + } + + return 0; } static void @@ -447,7 +541,7 @@ scherzo_analyze_chord (scherzo_t *scherzo) analyzed_note_t *notes; note_group_t *note_group; unsigned i, j, num_notes; - int bass_pitch; + int bass_pitch, inversion; const char *chord_name = NULL; if (scherzo->pedal_pressed) @@ -457,41 +551,41 @@ scherzo_analyze_chord (scherzo_t *scherzo) num_notes = note_group->num_notes; - struct { int pitches[1]; const char *name; } octaves[] = { - { {0}, "Octave"} + struct { modified_degree_t degrees[1]; const char *name; } octaves[] = { + { {{1, 0}}, "Octave"} }; - struct { int pitches[2]; const char *name; } intervals[] = { - { {0, 1}, "Minor 2nd"}, - { {0, 2}, "Major 2nd"}, - { {0, 3}, "Minor 3rd"}, - { {0, 4}, "Major 3rd"}, - { {0, 5}, "Perfect 4th"}, - { {0, 6}, "Diminished 5th/Augmented 4th"}, - { {0, 7}, "Perfect 5th"}, - { {0, 8}, "Minor 6th"}, - { {0, 9}, "Major 6th"}, - { {0, 10}, "Minor 7th"}, - { {0, 11}, "Major 7th"} + 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"} }; - struct { int pitches[3]; const char *name; } triads[] = { - { {0, 4, 8}, "Augmented triad" }, - { {0, 4, 7}, "Major triad" }, - { {0, 3, 7}, "Minor triad" }, - { {0, 3, 6}, "Diminished triad" } + struct { modified_degree_t degrees[3]; const char *name; } triads[] = { + { {{1, 0}, {3, 0}, {5, +1}}, "Augmented triad" }, + { {{1, 0}, {3, 0}, {5, 0}}, "Major triad" }, + { {{1, 0}, {3, -1}, {5, 0}}, "Minor triad" }, + { {{1, 0}, {3, -1}, {5, -1}}, "Diminished triad" } }; - struct { int pitches[4]; const char *name; } sevenths[] = { - { {0, 4, 8, 11}, "Augmented/major 7" }, - { {0, 4, 8, 10}, "Augmented 7" }, - { {0, 4, 7, 11}, "Major 7" }, - { {0, 4, 7, 10}, "Dominant 7" }, - { {0, 3, 7, 11}, "Minor/major 7" }, - { {0, 3, 7, 10}, "Minor 7" }, - { {0, 3, 6, 11}, "Diminished/major 7" }, - { {0, 3, 6, 10}, "Half-diminished 7" }, - { {0, 3, 6, 9}, "Diminished 7" } + struct { modified_degree_t degrees[4]; const char *name; } sevenths[] = { + { {{1, 0}, {3, 0}, {5, +1}, {7, 0}}, "Augmented/major 7" }, + { {{1, 0}, {3, 0}, {5, +1}, {7, -1}}, "Augmented 7" }, + { {{1, 0}, {3, 0}, {5, 0}, {7, 0}}, "Major 7" }, + { {{1, 0}, {3, 0}, {5, 0}, {7, -1}}, "Dominant 7" }, + { {{1, 0}, {3, -1}, {5, 0}, {7, 0}}, "Minor/major 7" }, + { {{1, 0}, {3, -1}, {5, 0}, {7, -1}}, "Minor 7" }, + { {{1, 0}, {3, -1}, {5, -1}, {7, 0}}, "Diminished/major 7" }, + { {{1, 0}, {3, -1}, {5, -1}, {7, -1}}, "Half-diminished 7" }, + { {{1, 0}, {3, -1}, {5, -1}, {7, -2}}, "Diminished 7" } }; if (scherzo->chord) { @@ -556,30 +650,77 @@ scherzo_analyze_chord (scherzo_t *scherzo) } } - for (i = 0; i < ARRAY_SIZE (octaves); i++) { - if (_chord_signature_matches (notes, num_notes, octaves[i].pitches, 1)) - chord_name = octaves[i].name; - } - - for (i = 0; i < ARRAY_SIZE (intervals); i++) { - if (_chord_signature_matches (notes, num_notes, intervals[i].pitches, 2)) - chord_name = intervals[i].name; - } - - for (i = 0; i < ARRAY_SIZE (triads); i++) { - if (_chord_signature_matches (notes, num_notes, triads[i].pitches, 3)) - chord_name = triads[i].name; + 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)) + { + chord_name = octaves[i].name; + break; + } + } + break; + case 2: + for (i = 0; i < ARRAY_SIZE (intervals); i++) { + if (_chord_signature_matches (notes, num_notes, + intervals[i].degrees, 2, &inversion)) + { + chord_name = intervals[i].name; + break; + } + } + break; + case 3: + for (i = 0; i < ARRAY_SIZE (triads); i++) { + if (_chord_signature_matches (notes, num_notes, + triads[i].degrees, 3, &inversion)) + { + chord_name = triads[i].name; + break; + } + } + break; + case 4: + for (i = 0; i < ARRAY_SIZE(sevenths); i++) { + if (_chord_signature_matches (notes, num_notes, + sevenths[i].degrees, 4, &inversion)) + { + chord_name = sevenths[i].name; + break; + } + } + break; } - for (i = 0; i < ARRAY_SIZE(sevenths); i++) { - if (_chord_signature_matches (notes, num_notes, sevenths[i].pitches, 4)) - chord_name = sevenths[i].name; + 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"; + break; + default: + fprintf (stderr, "Internal error: Unexpected inversion: %d\n", + inversion); + exit(1); + } + chord_name = talloc_asprintf (local, "%s %s", + chord_name, inversion_str); + } else { + chord_name = talloc_strdup (local, chord_name); + } + } else { + chord_name = talloc_strdup (local, "Unknown chord"); } - if (chord_name) - scherzo->chord = score_add_chord (scherzo->treble, chord_name); - else - scherzo->chord = score_add_chord (scherzo->treble, "Unknown or not a chord"); + scherzo->chord = score_add_chord (scherzo->treble, chord_name); DONE: talloc_free (local); @@ -800,25 +941,25 @@ _select_challenge (scherzo_t *scherzo) switch (*s) { case 'C': - pitch = SCORE_PITCH_VALUE(C, NATURAL); + pitch = SCORE_PITCH_C; break; case 'D': - pitch = SCORE_PITCH_VALUE(D, NATURAL); + pitch = SCORE_PITCH_D; break; case 'E': - pitch = SCORE_PITCH_VALUE(E, NATURAL); + pitch = SCORE_PITCH_E; break; case 'F': - pitch = SCORE_PITCH_VALUE(F, NATURAL); + pitch = SCORE_PITCH_F; break; case 'G': - pitch = SCORE_PITCH_VALUE(G, NATURAL); + pitch = SCORE_PITCH_G; break; case 'A': - pitch = SCORE_PITCH_VALUE(A, NATURAL); + pitch = SCORE_PITCH_A; break; case 'B': - pitch = SCORE_PITCH_VALUE(B, NATURAL); + pitch = SCORE_PITCH_B; break; default: fprintf (stderr, "Malformed pitch name: %s (expected 'A' - 'G')\n", s); @@ -976,8 +1117,9 @@ main (int argc, char *argv[]) scherzo.chord = NULL; - /* Default to octave 4 for computer keyboard keypresses. */ + /* Default to octave 4 and natural 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);