Add recognition of intervals.

[scherzo] / scherzo.c

diff --git a/scherzo.c b/scherzo.c
index 9b0e2d9ced96bc43dfcf5f8c388d373549c8923f..491489839c8cba69345f41d19a0f1879bbf1f97a 100644 (file)
--- a/scherzo.c
+++ b/scherzo.c
@@ -398,6 +398,11 @@ _chord_signature_matches (analyzed_note_t *notes,
        }
     }
 
+    /* If there are fewer notes in the signature than in the chord,
+     * then there is no match. */
+    if (n < num_notes)
+           return 0;
+
     return 1;
 }
 
@@ -410,6 +415,20 @@ scherzo_analyze_chord (scherzo_t *scherzo)
     int bass_pitch;
     const char *chord_name = NULL;
 
+    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 { int pitches[3]; const char *name; } triads[] = {
        { {0, 4, 8}, "Augmented triad" },
        { {0, 4, 7}, "Major triad" },
@@ -417,6 +436,18 @@ scherzo_analyze_chord (scherzo_t *scherzo)
        { {0, 3, 6}, "Diminished triad" }
     };
 
+    struct { int pitches[4]; const char *name; } sevenths[] = {
+       { {0, 4, 8, 11}, "Augmented/major 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, 10}, "Half-diminished 7" },
+       { {0, 3, 6, 9},  "Diminished 7" },
+       { {0, 4, 8, 10}, "Augmented 7" },
+       { {0, 3, 6, 11}, "Diminished/major 7" },
+    };
+
     if (scherzo->chord) {
        score_remove_chord (scherzo->chord);
        scherzo->chord = NULL;
@@ -446,17 +477,20 @@ scherzo_analyze_chord (scherzo_t *scherzo)
        notes[i].relative_pitch = notes[i].midi_pitch - bass_pitch;
     }
 
+    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;
     }
 
-/*
-    for (i = 0; i < num_sevenths; i++) {
-       if (_chord_signature_matches (notes, num_notes, seventh[i].pitches, 4))
-           chord_name = seventh[i].name;
+    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)
        scherzo->chord = score_add_chord (scherzo->treble, chord_name);