X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scherzo.c;h=0192c0c1a4dee0ca60fdc68d2ead86336aeaad24;hb=e77d712bf9f99c3d95f909621ae177b9f8175163;hp=92dc595fd9c7ab3f94e4befbbb49d7b2be0d1178;hpb=6b19e8f30b220108844da0e6d8d97d9684b2feb9;p=scherzo diff --git a/scherzo.c b/scherzo.c index 92dc595..0192c0c 100644 --- a/scherzo.c +++ b/scherzo.c @@ -64,7 +64,7 @@ typedef struct scherzo * keyboard". Any "piano keyboard" key knows its own octave and * accidental already. */ int keyboard_octave; - score_pitch_accidental_t keyboard_accidental; + pitch_accidental_t keyboard_accidental; int midi_fd; snd_midi_event_t *snd_midi_event; @@ -80,10 +80,10 @@ typedef struct scherzo /* Forward declarations. */ static score_note_t * -scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave); +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); @@ -148,11 +148,11 @@ 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_name_t pitch_name = PITCH_NATURAL (C, 0); + pitch_t pitch; if (scherzo->challenge.note) - octave = scherzo->challenge.note->octave; + octave = PITCH_OCTAVE (scherzo->challenge.note->pitch); else octave = scherzo->keyboard_octave; @@ -178,31 +178,31 @@ on_key_press_event (GtkWidget *widget, return FALSE; case GDK_KEY_c: case GDK_KEY_C: - pitch_name = SCORE_PITCH_NAME_C; + pitch_name = PITCH_NAME_C; break; case GDK_KEY_d: case GDK_KEY_D: - pitch_name = SCORE_PITCH_NAME_D; + pitch_name = PITCH_NAME_D; break; case GDK_KEY_e: case GDK_KEY_E: - pitch_name = SCORE_PITCH_NAME_E; + pitch_name = PITCH_NAME_E; break; case GDK_KEY_f: case GDK_KEY_F: - pitch_name = SCORE_PITCH_NAME_F; + pitch_name = PITCH_NAME_F; break; case GDK_KEY_g: case GDK_KEY_G: - pitch_name = SCORE_PITCH_NAME_G; + pitch_name = PITCH_NAME_G; break; case GDK_KEY_a: case GDK_KEY_A: - pitch_name = SCORE_PITCH_NAME_A; + pitch_name = PITCH_NAME_A; break; case GDK_KEY_b: case GDK_KEY_B: - pitch_name = SCORE_PITCH_NAME_B; + pitch_name = PITCH_NAME_B; break; case GDK_KEY_0: case GDK_KEY_1: @@ -219,23 +219,23 @@ on_key_press_event (GtkWidget *widget, scherzo_press_pedal (scherzo); break; case GDK_KEY_Up: - if (scherzo->keyboard_accidental < SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP) + if (scherzo->keyboard_accidental < PITCH_ACCIDENTAL_DOUBLE_SHARP) scherzo->keyboard_accidental++; break; case GDK_KEY_Down: - if (scherzo->keyboard_accidental > SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT) + if (scherzo->keyboard_accidental > PITCH_ACCIDENTAL_DOUBLE_FLAT) scherzo->keyboard_accidental--; break; } - pitch = SCORE_PITCH (pitch_name, scherzo->keyboard_accidental); + pitch = PITCH (pitch_name, scherzo->keyboard_accidental, octave); if ((key->keyval >= GDK_KEY_A && key->keyval <= GDK_KEY_G) || (key->keyval >= GDK_KEY_a && key->keyval <= GDK_KEY_g)) { score_note_t *note; - note = scherzo_press_note (scherzo, pitch, octave); + note = scherzo_press_note (scherzo, pitch); _judge_note (scherzo, note); gtk_widget_queue_draw (scherzo->window); @@ -255,54 +255,54 @@ 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_name_t pitch_name = PITCH_NAME_C; + pitch_t pitch; if (scherzo->challenge.note) - octave = scherzo->challenge.note->octave; + octave = PITCH_OCTAVE (scherzo->challenge.note->pitch); else octave = scherzo->keyboard_octave; switch (key->keyval) { case GDK_KEY_c: case GDK_KEY_C: - pitch_name = SCORE_PITCH_NAME_C; + pitch_name = PITCH_NAME_C; break; case GDK_KEY_d: case GDK_KEY_D: - pitch_name = SCORE_PITCH_NAME_D; + pitch_name = PITCH_NAME_D; break; case GDK_KEY_e: case GDK_KEY_E: - pitch_name = SCORE_PITCH_NAME_E; + pitch_name = PITCH_NAME_E; break; case GDK_KEY_f: case GDK_KEY_F: - pitch_name = SCORE_PITCH_NAME_F; + pitch_name = PITCH_NAME_F; break; case GDK_KEY_g: case GDK_KEY_G: - pitch_name = SCORE_PITCH_NAME_G; + pitch_name = PITCH_NAME_G; break; case GDK_KEY_a: case GDK_KEY_A: - pitch_name = SCORE_PITCH_NAME_A; + pitch_name = PITCH_NAME_A; break; case GDK_KEY_b: case GDK_KEY_B: - pitch_name = SCORE_PITCH_NAME_B; + pitch_name = PITCH_NAME_B; break; case GDK_KEY_space: scherzo_release_pedal (scherzo); break; } - pitch = SCORE_PITCH (pitch_name, scherzo->keyboard_accidental); + pitch = PITCH (pitch_name, scherzo->keyboard_accidental, octave); 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); + scherzo_release_note (scherzo, pitch); _score_challenge (scherzo); gtk_widget_queue_draw (scherzo->window); @@ -315,47 +315,47 @@ on_key_release_event (unused (GtkWidget *widget), } static unsigned char -_score_pitch_and_octave_to_midi (score_pitch_t pitch, - int octave) +_pitch_to_midi (pitch_t pitch) { + int octave = PITCH_OCTAVE (pitch); unsigned char midi_note = 12 * (octave + 1); - switch (SCORE_PITCH_NAME (pitch)) { - case SCORE_PITCH_NAME_C: + switch (PITCH_NAME (pitch)) { + case PITCH_NAME_C: break; - case SCORE_PITCH_NAME_D: + case PITCH_NAME_D: midi_note += 2; break; - case SCORE_PITCH_NAME_E: + case PITCH_NAME_E: midi_note += 4; break; - case SCORE_PITCH_NAME_F: + case PITCH_NAME_F: midi_note += 5; break; - case SCORE_PITCH_NAME_G: + case PITCH_NAME_G: midi_note += 7; break; - case SCORE_PITCH_NAME_A: + case PITCH_NAME_A: midi_note += 9; break; - case SCORE_PITCH_NAME_B: + case PITCH_NAME_B: midi_note += 11; break; } - switch (SCORE_PITCH_ACCIDENTAL (pitch)) { - case SCORE_PITCH_ACCIDENTAL_DOUBLE_FLAT: + switch (PITCH_ACCIDENTAL (pitch)) { + case PITCH_ACCIDENTAL_DOUBLE_FLAT: midi_note -= 2; break; - case SCORE_PITCH_ACCIDENTAL_FLAT: + case PITCH_ACCIDENTAL_FLAT: midi_note -= 1; break; - case SCORE_PITCH_ACCIDENTAL_NATURAL: + case PITCH_ACCIDENTAL_NATURAL: break; - case SCORE_PITCH_ACCIDENTAL_SHARP: + case PITCH_ACCIDENTAL_SHARP: midi_note += 1; break; - case SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP: + case PITCH_ACCIDENTAL_DOUBLE_SHARP: midi_note += 2; break; } @@ -363,50 +363,50 @@ _score_pitch_and_octave_to_midi (score_pitch_t pitch, return midi_note; } -static void -_midi_to_score_pitch_and_octave (unsigned char midi_note, - score_pitch_t *pitch, - int *octave) +/* octave can optionally by NULL */ +static pitch_t +_midi_to_pitch (unsigned char midi_note) { - *octave = midi_note / 12 - 1; + int octave = octave = midi_note / 12 - 1; switch (midi_note % 12) { + default: case 0: - *pitch = SCORE_PITCH_C; + return PITCH_LITERAL (C, NATURAL, octave); break; case 1: - *pitch = SCORE_PITCH_Cs; + return PITCH_LITERAL (C, SHARP, octave); break; case 2: - *pitch = SCORE_PITCH_D; + return PITCH_LITERAL (D, NATURAL, octave); break; case 3: - *pitch = SCORE_PITCH_Ds; + return PITCH_LITERAL (D, SHARP, octave); break; case 4: - *pitch = SCORE_PITCH_E; + return PITCH_LITERAL (E, NATURAL, octave); break; case 5: - *pitch = SCORE_PITCH_F; + return PITCH_LITERAL (F, NATURAL, octave); break; case 6: - *pitch = SCORE_PITCH_Fs; + return PITCH_LITERAL (F, SHARP, octave); break; case 7: - *pitch = SCORE_PITCH_G; + return PITCH_LITERAL (G, NATURAL, octave); break; case 8: - *pitch = SCORE_PITCH_Gs; + return PITCH_LITERAL (G, SHARP, octave); break; case 9: - *pitch = SCORE_PITCH_A; + return PITCH_LITERAL (A, NATURAL, octave); break; case 10: - *pitch = SCORE_PITCH_As; + return PITCH_LITERAL (A, SHARP, octave); break; case 11: - *pitch = SCORE_PITCH_B; + return PITCH_LITERAL (B, NATURAL, octave); break; } } @@ -457,7 +457,7 @@ _modified_degree_to_half_steps (const modified_degree_t *degree) scale_degree = (scale_degree % 8) + 1; /* Number of half steps from root to specified degree within a - * diatonic scaled. */ + * diatonic scale. */ switch (scale_degree) { case 1: half_steps = 0; @@ -489,13 +489,27 @@ _modified_degree_to_half_steps (const modified_degree_t *degree) return half_steps + degree->modification; } +/* Number of half steps from 'root' up to 'pitch' (that is, counting + * the steps up a chromatic scale), within the same octave. */ +static int +_pitch_from_root_in_half_steps (pitch_t pitch, pitch_t root) +{ + int root_midi = _pitch_to_midi (root); + int pitch_midi = _pitch_to_midi (pitch); + + while (pitch_midi < root_midi) + pitch_midi += 12; + + return (pitch_midi - root_midi) % 12; +} + static int _chord_signature_matches (analyzed_note_t *notes, int num_notes, modified_degree_t *degrees, int num_degrees, int inversion, - score_pitch_t *root) + pitch_t *root) { #define MAX_DEGREES 6 int relative_pitches[MAX_DEGREES]; @@ -537,83 +551,58 @@ _chord_signature_matches (analyzed_note_t *notes, } static const char * -_pitch_str (score_pitch_t pitch) +_pitch_str (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𝄪"; + static char double_flat[] = "X𝄫"; + static char flat[] = "X♭"; + static char natural[] = "X"; + static char sharp[] = "X♯"; + static char double_sharp[] = "X𝄪"; + char *ret; + + switch (PITCH_ACCIDENTAL (pitch)) { + case PITCH_ACCIDENTAL_DOUBLE_FLAT: + ret = double_flat; + break; + case PITCH_ACCIDENTAL_FLAT: + ret = flat; + break; + case PITCH_ACCIDENTAL_NATURAL: + ret = natural; + break; + case PITCH_ACCIDENTAL_SHARP: + ret = sharp; + break; + case PITCH_ACCIDENTAL_DOUBLE_SHARP: + ret = double_sharp; + break; } - fprintf (stderr, "Internal error: Unknown pitch %d\n", pitch); - exit (1); + switch (PITCH_NAME(pitch)) { + case PITCH_NAME_C: + ret[0] = 'C'; + break; + case PITCH_NAME_D: + ret[0] = 'D'; + break; + case PITCH_NAME_E: + ret[0] = 'E'; + break; + case PITCH_NAME_F: + ret[0] = 'F'; + break; + case PITCH_NAME_G: + ret[0] = 'G'; + break; + case PITCH_NAME_A: + ret[0] = 'A'; + break; + case PITCH_NAME_B: + ret[0] = 'B'; + break; + } + + return ret; } typedef struct chord_signature @@ -764,6 +753,119 @@ chord_signature_t signatures[] = { { 6, {{1, 0}, {9, -1}, {3, -1}, {11, -1}, {5, -1}, {7, -2}}, "°" SUP "11" PUS } }; +static void +scherzo_adjust_note_to_match_modified_degree (score_note_t *note, + pitch_t root, + modified_degree_t *degree) +{ + pitch_name_t name = PITCH_NAME (note->pitch); + pitch_accidental_t accidental = PITCH_ACCIDENTAL (note->pitch); + int octave = PITCH_OCTAVE (note->pitch); + int degree_zero_based = (degree->degree - 1) % 7; + int degree_delta; + + int note_degree_zero_based = name - PITCH_NAME (root); + if (note_degree_zero_based < 0) + note_degree_zero_based += 7; + + if (note_degree_zero_based == degree_zero_based) + return; + + degree_delta = note_degree_zero_based - degree_zero_based; + if (degree_delta > 3) + degree_delta = - (7 - degree_delta); + if (degree_delta < -3) + degree_delta = - (-7 - degree_delta); + + if (abs (degree_delta) != 1) { + fprintf (stderr, "Internal error: Cannot adjust a note more than one degree (%d vs. %d).\n", note_degree_zero_based + 1, degree->degree); + exit (1); + } + + if (degree_delta == -1) { + if (name == PITCH_NAME_B) { + name = PITCH_NAME_C; + octave++; + } else { + name++; + } + switch (name) { + case PITCH_NAME_D: + case PITCH_NAME_E: + case PITCH_NAME_G: + case PITCH_NAME_A: + case PITCH_NAME_B: + accidental -= 2; + break; + case PITCH_NAME_C: + case PITCH_NAME_F: + accidental -= 1; + break; + } + } + + if (degree_delta == +1) { + if (name == PITCH_NAME_C) { + name = PITCH_NAME_B; + octave--; + } else { + name--; + } + switch (name) { + case PITCH_NAME_C: + case PITCH_NAME_D: + case PITCH_NAME_F: + case PITCH_NAME_G: + case PITCH_NAME_A: + accidental += 2; + break; + case PITCH_NAME_E: + case PITCH_NAME_B: + accidental += 1; + } + } + + if (accidental < 0 || accidental > PITCH_ACCIDENTAL_DOUBLE_SHARP) { + fprintf (stderr, "Internal error: Trying to adjust an accidental out of range (degree_delta == %d (%d - %d), new accidental == %d).\n", degree_delta, note_degree_zero_based, degree_zero_based, accidental); + exit (1); + } + + note->pitch = PITCH (name, accidental, octave); +} + +static void +_spell_chord_by_signature (note_group_t *chord, + int num_notes, + chord_signature_t *signature, + pitch_t root) +{ + int i, degree, note_half_steps, degree_half_steps; + int root_midi; + + /* Sanitize root to eliminate things like double-flats, + * double-sharps, Cb, E#, etc. */ + root_midi = _pitch_to_midi (root); + root = _midi_to_pitch (root_midi); + + for (i = 0; i < num_notes; i++) { + note_half_steps = _pitch_from_root_in_half_steps (chord->notes[i]->pitch, + 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) { + scherzo_adjust_note_to_match_modified_degree (chord->notes[i], + root, + &signature->degrees[degree]); + break; + } + } + if (note_half_steps != degree_half_steps) { + fprintf (stderr, "Internal error: Chord and degree mis-match\n"); + exit (1); + } + } +} + static void scherzo_analyze_chord (scherzo_t *scherzo) { @@ -772,8 +874,9 @@ scherzo_analyze_chord (scherzo_t *scherzo) note_group_t *note_group; unsigned i, j, num_notes; int bass_pitch, inversion; - score_pitch_t root; - const char *chord_name = NULL; + pitch_t root; + chord_signature_t *match = NULL; + char *chord_name; if (scherzo->pedal_pressed) note_group = &scherzo->notes_pedaled; @@ -797,8 +900,7 @@ scherzo_analyze_chord (scherzo_t *scherzo) 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); + notes[i].midi_pitch = _pitch_to_midi (note->pitch); /* Relative pitch will be filled in after sorting. */ notes[i].relative_pitch = 0; } @@ -851,14 +953,16 @@ scherzo_analyze_chord (scherzo_t *scherzo) signatures[i].num_degrees, inversion, &root)) { - chord_name = signatures[i].name; - goto CHORD_NAME_KNOWN; + match = &signatures[i]; + goto HAVE_MATCH; } } } - CHORD_NAME_KNOWN: +HAVE_MATCH: + + chord_name = (char *) signatures[i].name; - if (chord_name) { + if (match) { /* Don't print root pitch for octaves and inversions, * (since a pitch name alone looks like a major triad) */ if (num_notes < 3) { @@ -868,8 +972,11 @@ scherzo_analyze_chord (scherzo_t *scherzo) _pitch_str (root), chord_name); } + + _spell_chord_by_signature (note_group, num_notes, + match, root); } else { - chord_name = talloc_strdup (local, "Unknown chord"); + chord_name = talloc_strdup (local, "?"); } scherzo->chord = score_add_chord (scherzo->treble, chord_name); @@ -893,13 +1000,9 @@ note_group_add_note (note_group_t *group, score_note_t *note) 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) - { + for (i = 0; i < group->num_notes; i++) + if (group->notes[i]->pitch == note->pitch) return; - } - } group->num_notes++; @@ -933,7 +1036,7 @@ note_group_remove_note_at (note_group_t *group, int i) } static score_note_t * -scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) +scherzo_press_note (scherzo_t *scherzo, pitch_t pitch) { score_staff_t *staff; score_note_t *note; @@ -941,22 +1044,18 @@ scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) if (scherzo->challenge.note) { staff = scherzo->challenge.staff; - } else if (octave >= 4) { + } else if (PITCH_OCTAVE (pitch) >= 4) { staff = scherzo->treble; } else { staff = scherzo->bass; } /* 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) - { + for (i = 0; i < scherzo->notes_pressed.num_notes; i++) + if (scherzo->notes_pressed.notes[i]->pitch == pitch) return scherzo->notes_pressed.notes[i]; - } - } - note = score_add_note (staff, pitch, octave, SCORE_DURATION_WHOLE); + note = score_add_note (staff, pitch, SCORE_DURATION_WHOLE); note_group_add_note (&scherzo->notes_pressed, note); @@ -969,15 +1068,18 @@ scherzo_press_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) } static void -scherzo_release_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) +scherzo_release_note (scherzo_t *scherzo, pitch_t pitch) { score_note_t *note; int i; int found = 0; + int target_midi = _pitch_to_midi (pitch); + int note_midi; for (i = scherzo->notes_pressed.num_notes - 1; i >=0; i--) { note = scherzo->notes_pressed.notes[i]; - if (note->pitch == pitch && note->octave == octave) { + note_midi = _pitch_to_midi (note->pitch); + if (note_midi == target_midi) { found = 1; if (! scherzo->pedal_pressed) score_remove_note (note); @@ -995,23 +1097,13 @@ scherzo_release_note (scherzo_t *scherzo, score_pitch_t pitch, int octave) static score_note_t * 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); - - return scherzo_press_note (scherzo, pitch, octave); + return scherzo_press_note (scherzo, _midi_to_pitch (midi_note)); } static void scherzo_release_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_release_note (scherzo, pitch, octave); + scherzo_release_note (scherzo, _midi_to_pitch (midi_note)); } static void @@ -1035,7 +1127,7 @@ scherzo_release_pedal (scherzo_t *scherzo) /* 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); + new_note = score_add_note (note->staff, note->pitch, note->duration); scherzo->notes_pressed.notes[i] = new_note; } @@ -1060,7 +1152,8 @@ _select_challenge (scherzo_t *scherzo) bool_t introduced_unused; item_t *item; challenge_t *challenge = &scherzo->challenge; - score_pitch_t pitch; + pitch_name_t pitch_name; + pitch_t pitch; int octave; char *s; @@ -1093,25 +1186,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); @@ -1126,7 +1219,9 @@ _select_challenge (scherzo_t *scherzo) octave = *s - '0'; - challenge->note = score_add_note (challenge->staff, pitch, octave, + pitch = PITCH (pitch_name, PITCH_ACCIDENTAL_NATURAL, octave); + + challenge->note = score_add_note (challenge->staff, pitch, SCORE_DURATION_WHOLE); challenge->satisfied = 0; challenge->mistaken = 0; @@ -1143,8 +1238,7 @@ _judge_note (scherzo_t *scherzo, score_note_t *note) return; } - if (note->pitch == challenge->note->pitch && - note->octave == challenge->note->octave) + if (note->pitch == challenge->note->pitch) { challenge->satisfied = 1; score_set_note_color_rgb (note, 18/256., 130/256., 28/256.); /* green */ @@ -1271,7 +1365,7 @@ main (int argc, char *argv[]) /* Default to octave 4 and natural for computer keyboard keypresses. */ scherzo.keyboard_octave = 4; - scherzo.keyboard_accidental = SCORE_PITCH_ACCIDENTAL_NATURAL; + scherzo.keyboard_accidental = PITCH_ACCIDENTAL_NATURAL; note_group_init (scherzo.ctx, &scherzo.notes_pressed); note_group_init (scherzo.ctx, &scherzo.notes_pedaled);