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;
{
scherzo_t *scherzo = user_data;
int octave;
+ score_pitch_name_t pitch_name;
score_pitch_t pitch;
if (scherzo->challenge.note)
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:
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))
{
{
scherzo_t *scherzo = user_data;
int octave;
+ score_pitch_name_t pitch_name;
score_pitch_t pitch;
if (scherzo->challenge.note)
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))
{
int *signature_pitches,
int num_signature_pitches)
{
- int n, s;
+ int i;
- for (n = 0, s = 0; s < num_signature_pitches; s++) {
- if (n >= num_notes)
- return 0;
- if (notes[n].relative_pitch != signature_pitches[s])
+ if (num_notes != num_signature_pitches)
return 0;
- n++;
- /* Skip repeated notes in chord being tested. */
- while (n < num_notes &&
- notes[n].relative_pitch == signature_pitches[s])
- {
- n++;
- }
- }
- /* If there are fewer notes in the signature than in the chord,
- * then there is no match. */
- if (n < num_notes)
+ for (i = 0; i < num_notes; i++)
+ if (notes[i].relative_pitch != signature_pitches[i])
return 0;
return 1;
void *local = talloc_new (NULL);
analyzed_note_t *notes;
note_group_t *note_group;
- unsigned i, num_notes;
+ unsigned i, j, num_notes;
int bass_pitch;
const char *chord_name = NULL;
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, 10}, "Half-diminished 7" },
- { {0, 3, 6, 9}, "Diminished 7" },
- { {0, 4, 8, 10}, "Augmented 7" },
{ {0, 3, 6, 11}, "Diminished/major 7" },
+ { {0, 3, 6, 10}, "Half-diminished 7" },
+ { {0, 3, 6, 9}, "Diminished 7" }
};
if (scherzo->chord) {
qsort (notes, num_notes, sizeof (analyzed_note_t),
_compare_analyzed_note_by_relative_pitch);
- 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;
+ /* 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--;
+
+ if (j < num_notes - 1) {
+ memmove (¬es[i+1], ¬es[j+1],
+ (num_notes - j) * sizeof (analyzed_note_t));
+ }
+
+ num_notes -= (j - i);
+ }
}
- for (i = 0; i < ARRAY_SIZE(sevenths); i++) {
- if (_chord_signature_matches (notes, num_notes, sevenths[i].pitches, 4))
- chord_name = sevenths[i].name;
+ switch (num_notes) {
+ case 1:
+ for (i = 0; i < ARRAY_SIZE (octaves); i++) {
+ if (_chord_signature_matches (notes, num_notes, octaves[i].pitches, 1))
+ chord_name = octaves[i].name;
+ }
+ break;
+ case 2:
+ for (i = 0; i < ARRAY_SIZE (intervals); i++) {
+ if (_chord_signature_matches (notes, num_notes, intervals[i].pitches, 2))
+ chord_name = intervals[i].name;
+ }
+ break;
+ case 3:
+ for (i = 0; i < ARRAY_SIZE (triads); i++) {
+ if (_chord_signature_matches (notes, num_notes, triads[i].pitches, 3))
+ chord_name = triads[i].name;
+ }
+ break;
+ case 4:
+ for (i = 0; i < ARRAY_SIZE(sevenths); i++) {
+ if (_chord_signature_matches (notes, num_notes, sevenths[i].pitches, 4))
+ chord_name = sevenths[i].name;
+ }
+ break;
}
if (chord_name)
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);
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);
projects / scherzo / blobdiff