X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=098008930e4d4d77b4dd21ec82ad40ca52d19554;hb=fc6b1da08cd8552050d2669363a85e405f19736d;hp=b9a463368b86129dd1eee0cdd74cdabcecf7b561;hpb=5a43b0324c6353c1541a3c1fad52e2f040ab389d;p=scherzo diff --git a/scherzo.c b/scherzo.c index b9a4633..0980089 100644 --- a/scherzo.c +++ b/scherzo.c @@ -147,7 +147,8 @@ on_key_press_event (GtkWidget *widget, { scherzo_t *scherzo = user_data; int octave; - score_pitch_name_t pitch_name; + /* Initialize to keep the compiler quiet. */ + score_pitch_name_t pitch_name = SCORE_PITCH_C; score_pitch_t pitch; if (scherzo->challenge.note) @@ -253,7 +254,8 @@ on_key_release_event (unused (GtkWidget *widget), { scherzo_t *scherzo = user_data; int octave; - score_pitch_name_t pitch_name; + /* Initialize to keep the compiler quiet. */ + score_pitch_name_t pitch_name = SCORE_PITCH_NAME_C; score_pitch_t pitch; if (scherzo->challenge.note) @@ -438,22 +440,184 @@ _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, + score_pitch_t *root) { - int i; +#define MAX_DEGREES 4 + int relative_pitches[MAX_DEGREES]; + int inversion, max_inversions; + int i, root_index; - 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; + + root_index = (num_notes - inversion) % num_notes; + *root = notes[root_index].note->pitch; + + *inversion_ret = inversion; + + return 1; + + NEXT_INVERSION: + ; + } + + return 0; +} + +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 @@ -463,7 +627,8 @@ 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; + score_pitch_t root; const char *chord_name = NULL; if (scherzo->pedal_pressed) @@ -473,41 +638,54 @@ 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" } +/* 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 "" +#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 { 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}}, 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, -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 } }; if (scherzo->chord) { @@ -575,34 +753,81 @@ scherzo_analyze_chord (scherzo_t *scherzo) switch (num_notes) { case 1: for (i = 0; i < ARRAY_SIZE (octaves); i++) { - if (_chord_signature_matches (notes, num_notes, octaves[i].pitches, 1)) + if (_chord_signature_matches (notes, num_notes, + octaves[i].degrees, 1, + &inversion, &root)) + { 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].pitches, 2)) + if (_chord_signature_matches (notes, num_notes, + intervals[i].degrees, 2, + &inversion, &root)) + { 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].pitches, 3)) + if (_chord_signature_matches (notes, num_notes, + triads[i].degrees, 3, + &inversion, &root)) + { 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].pitches, 4)) + if (_chord_signature_matches (notes, num_notes, + sevenths[i].degrees, 4, + &inversion, &root)) + { chord_name = sevenths[i].name; + break; + } } break; } - 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"); + 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 %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);