int mistaken;
} challenge_t;
-typedef struct note_group
+typedef struct pitch_group
{
void *ctx;
- score_note_t **notes;
+ pitch_t *pitches;
int size;
- int num_notes;
-} note_group_t;
+ int num_pitches;
+} pitch_group_t;
typedef struct scherzo
{
GtkWidget *window;
score_t *score;
int staff_height;
+
score_staff_t *treble;
score_staff_t *bass;
score_chord_t *chord;
mnemon_t mnemon;
challenge_t challenge;
- note_group_t notes_pressed;
- note_group_t notes_pedaled;
+ pitch_group_t notes_pressed;
+ pitch_group_t notes_pedaled;
int pedal_pressed;
} scherzo_t;
/* Forward declarations. */
-static score_note_t *
+static void
scherzo_press_note (scherzo_t *scherzo, pitch_t pitch);
static void
scherzo_release_pedal (scherzo_t *scherzo);
static void
-_judge_note (scherzo_t *scherzo, score_note_t *note);
+_judge_pitch (scherzo_t *scherzo, pitch_t pitch);
static void
_score_challenge (scherzo_t *scherzo);
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);
- _judge_note (scherzo, note);
+ scherzo_press_note (scherzo, pitch);
+ _judge_pitch (scherzo, pitch);
gtk_widget_queue_draw (scherzo->window);
return TRUE;
/* Determine a chord name (if any) from the current notes pressed */
-typedef struct analyzed_note {
+typedef struct analyzed_pitch {
/* Original note being analzyed. */
- score_note_t *note;
+ pitch_t pitch;
/* Absolute pitch (expressed as midi number). */
int midi_pitch;
/* Pitch relative to bass note. */
int relative_pitch;
-} analyzed_note_t;
+} analyzed_pitch_t;
static int
-_compare_analyzed_note_by_midi_pitch (const void *va, const void *vb)
+_compare_analyzed_pitch_by_midi_pitch (const void *va, const void *vb)
{
- const analyzed_note_t *a = va, *b = vb;
+ const analyzed_pitch_t *a = va, *b = vb;
return a->midi_pitch - b->midi_pitch;
}
static int
-_compare_analyzed_note_by_relative_pitch (const void *va, const void *vb)
+_compare_analyzed_pitch_by_relative_pitch (const void *va, const void *vb)
{
- const analyzed_note_t *a = va, *b = vb;
+ const analyzed_pitch_t *a = va, *b = vb;
return a->relative_pitch - b->relative_pitch;
}
}
static int
-_chord_signature_matches (analyzed_note_t *notes,
- int num_notes,
+_chord_signature_matches (analyzed_pitch_t *pitches,
+ int num_pitches,
modified_degree_t *degrees,
int num_degrees,
int inversion,
assert (num_degrees <= MAX_DEGREES);
- if (num_notes != num_degrees)
+ if (num_pitches != num_degrees)
return 0;
if (inversion >= num_degrees)
}
- for (i = 0; i < num_notes; i++)
- if (notes[i].relative_pitch != relative_pitches[i])
+ for (i = 0; i < num_pitches; i++)
+ if (pitches[i].relative_pitch != relative_pitches[i])
return 0;
- root_index = (num_notes - inversion) % num_notes;
- *root = notes[root_index].note->pitch;
+ root_index = (num_pitches - inversion) % num_pitches;
+ *root = pitches[root_index].pitch;
return 1;
}
};
static void
-scherzo_adjust_note_to_match_modified_degree (score_note_t *note,
- pitch_t root,
- modified_degree_t *degree)
+scherzo_adjust_pitch_to_match_modified_degree (pitch_t *pitch,
+ 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);
+ pitch_name_t name = PITCH_NAME (*pitch);
+ pitch_accidental_t accidental = PITCH_ACCIDENTAL (*pitch);
+ int octave = PITCH_OCTAVE (*pitch);
int degree_zero_based = (degree->degree - 1) % 7;
int degree_delta;
exit (1);
}
- note->pitch = PITCH (name, accidental, octave);
+ *pitch = PITCH (name, accidental, octave);
}
static void
-_spell_chord_by_signature (note_group_t *chord,
+_spell_chord_by_signature (pitch_group_t *chord,
int num_notes,
chord_signature_t *signature,
pitch_t 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,
+ note_half_steps = _pitch_from_root_in_half_steps (chord->pitches[i],
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]);
+ scherzo_adjust_pitch_to_match_modified_degree (&chord->pitches[i],
+ root,
+ &signature->degrees[degree]);
break;
}
}
scherzo_analyze_chord (scherzo_t *scherzo)
{
void *local = talloc_new (NULL);
- analyzed_note_t *notes;
- note_group_t *note_group;
- unsigned i, j, num_notes;
+ analyzed_pitch_t *pitches;
+ pitch_group_t *pitch_group;
+ unsigned i, j, num_pitches;
int bass_pitch, inversion;
pitch_t root;
chord_signature_t *match = NULL;
char *chord_name;
if (scherzo->pedal_pressed)
- note_group = &scherzo->notes_pedaled;
+ pitch_group = &scherzo->notes_pedaled;
else
- note_group = &scherzo->notes_pressed;
+ pitch_group = &scherzo->notes_pressed;
- num_notes = note_group->num_notes;
+ num_pitches = pitch_group->num_pitches;
if (scherzo->chord) {
score_remove_chord (scherzo->chord);
scherzo->chord = NULL;
}
- if (num_notes <= 1)
+ if (num_pitches <= 1)
goto DONE;
- notes = talloc_array (local, analyzed_note_t, num_notes);
- if (notes == NULL)
+ pitches = talloc_array (local, analyzed_pitch_t, num_pitches);
+ if (pitches == NULL)
goto DONE;
- for (i = 0; i < num_notes; i++) {
- score_note_t *note = note_group->notes[i];
- notes[i].note = note;
- notes[i].midi_pitch = _pitch_to_midi (note->pitch);
+ for (i = 0; i < num_pitches; i++) {
+ pitch_t pitch = pitch_group->pitches[i];
+ pitches[i].pitch = pitch;
+ pitches[i].midi_pitch = _pitch_to_midi (pitch);
/* Relative pitch will be filled in after sorting. */
- notes[i].relative_pitch = 0;
+ pitches[i].relative_pitch = 0;
}
/* First, sort by midi pitch to find the bass note. */
- qsort (notes, num_notes, sizeof (analyzed_note_t),
- _compare_analyzed_note_by_midi_pitch);
+ qsort (pitches, num_pitches, sizeof (analyzed_pitch_t),
+ _compare_analyzed_pitch_by_midi_pitch);
- bass_pitch = notes[0].midi_pitch;
+ bass_pitch = pitches[0].midi_pitch;
/* With the bass note identified, we can find all relative pitches. */
- for (i = 0; i < num_notes; i++) {
- notes[i].relative_pitch = notes[i].midi_pitch - bass_pitch;
- while (notes[i].relative_pitch >= 12)
- notes[i].relative_pitch -= 12;
+ for (i = 0; i < num_pitches; i++) {
+ pitches[i].relative_pitch = pitches[i].midi_pitch - bass_pitch;
+ while (pitches[i].relative_pitch >= 12)
+ pitches[i].relative_pitch -= 12;
}
/* Now, sort again by relative pitch. */
- qsort (notes, num_notes, sizeof (analyzed_note_t),
- _compare_analyzed_note_by_relative_pitch);
+ qsort (pitches, num_pitches, sizeof (analyzed_pitch_t),
+ _compare_analyzed_pitch_by_relative_pitch);
/* Finally, eliminate all duplicate notes. */
- for (i = 0; i < num_notes - 1; i++) {
- if (notes[i+1].relative_pitch == notes[i].relative_pitch) {
+ for (i = 0; i < num_pitches - 1; i++) {
+ if (pitches[i+1].relative_pitch == pitches[i].relative_pitch) {
j = i+1;
- while (j < num_notes &&
- notes[j].relative_pitch == notes[i].relative_pitch)
+ while (j < num_pitches &&
+ pitches[j].relative_pitch == pitches[i].relative_pitch)
{
j++;
}
* the array bounds).*/
j--;
- if (j < num_notes - 1) {
- memmove (¬es[i+1], ¬es[j+1],
- (num_notes - j) * sizeof (analyzed_note_t));
+ if (j < num_pitches - 1) {
+ memmove (&pitches[i+1], &pitches[j+1],
+ (num_pitches - j) * sizeof (analyzed_pitch_t));
}
- num_notes -= (j - i);
+ num_pitches -= (j - i);
}
}
for (inversion = 0; inversion < 4; inversion++) {
for (i = 0; i < ARRAY_SIZE (signatures); i++) {
- if (_chord_signature_matches (notes, num_notes,
+ if (_chord_signature_matches (pitches, num_pitches,
signatures[i].degrees,
signatures[i].num_degrees,
inversion, &root))
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) {
+ if (num_pitches < 3) {
chord_name = talloc_strdup (local, chord_name);
} else {
chord_name = talloc_asprintf (local, "%s%s",
chord_name);
}
- _spell_chord_by_signature (note_group, num_notes,
+ _spell_chord_by_signature (pitch_group, num_pitches,
match, root);
} else {
chord_name = talloc_strdup (local, "?");
}
static void
-note_group_init (void *ctx, note_group_t *group)
+pitch_group_init (void *ctx, pitch_group_t *group)
{
group->ctx = ctx;
- group->notes = NULL;
+ group->pitches = NULL;
group->size = 0;
- group->num_notes = 0;
+ group->num_pitches = 0;
}
static void
-note_group_add_note (note_group_t *group, score_note_t *note)
+pitch_group_add_pitch (pitch_group_t *group, pitch_t pitch)
{
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)
+ /* Do nothing if pitch is already in group. */
+ for (i = 0; i < group->num_pitches; i++)
+ if (group->pitches[i] == pitch)
return;
- group->num_notes++;
+ group->num_pitches++;
- if (group->num_notes > group->size) {
+ if (group->num_pitches > group->size) {
group->size++;
- group->notes = talloc_realloc (group->ctx, group->notes,
- score_note_t*, group->size);
+ group->pitches = talloc_realloc (group->ctx, group->pitches,
+ pitch_t, group->size);
- if (group->notes == NULL) {
+ if (group->pitches == NULL) {
fprintf (stderr, "Out of memory.\n");
exit (1);
}
}
- group->notes[group->num_notes - 1] = note;
+ group->pitches[group->num_pitches - 1] = pitch;
}
static void
-note_group_remove_note_at (note_group_t *group, int i)
+pitch_group_remove_pitch_at (pitch_group_t *group, int i)
{
- if (i >= group->num_notes) {
- fprintf (stderr, "Internal error: No note to remove at index %d\n", i);
+ if (i > group->num_pitches) {
+ fprintf (stderr, "Internal error: Cannot remove pitch %d from group with only %d %s\n",
+ i, group->num_pitches,
+ group->num_pitches == 1 ? "pitch" : "pitches");
exit (1);
}
- if (i < group->num_notes - 1) {
- memmove (group->notes + i, group->notes + i + 1,
- (group->num_notes - 1 - i) * sizeof (score_note_t*));
+ if (i < group->num_pitches - 1) {
+ memmove (group->pitches + i, group->pitches + i + 1,
+ (group->num_pitches - 1 - i) * sizeof (pitch_t));
}
- group->num_notes--;
+
+ group->num_pitches--;
}
-static score_note_t *
-scherzo_press_note (scherzo_t *scherzo, pitch_t pitch)
+static void
+pitch_group_remove_pitch (pitch_group_t *group, pitch_t pitch)
{
- score_staff_t *staff;
- score_note_t *note;
int i;
- if (scherzo->challenge.note) {
- staff = scherzo->challenge.staff;
- } else if (PITCH_OCTAVE (pitch) >= 4) {
- staff = scherzo->treble;
- } else {
- staff = scherzo->bass;
+ for (i = 0; i < group->num_pitches; i++)
+ if (group->pitches[i] == pitch)
+ pitch_group_remove_pitch_at (group, i);
+}
+
+static void
+scherzo_update_notes_and_chord (scherzo_t *scherzo)
+{
+ if (scherzo->notes_pressed.num_pitches == 0 &&
+ scherzo->notes_pedaled.num_pitches == 0)
+ {
+ score_remove_notes (scherzo->score);
+
+ if (scherzo->chord)
+ score_remove_chord (scherzo->chord);
+
+ gtk_widget_queue_draw (scherzo->window);
}
+}
- /* 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)
- return scherzo->notes_pressed.notes[i];
+static void
+scherzo_press_note (scherzo_t *scherzo, pitch_t pitch)
+{
+ int i;
- note = score_add_note (staff, pitch, SCORE_DURATION_WHOLE);
+ /* Do nothing if this note is already pressed. */
+ for (i = 0; i < scherzo->notes_pressed.num_pitches; i++)
+ if (scherzo->notes_pressed.pitches[i] == pitch)
+ return;
- note_group_add_note (&scherzo->notes_pressed, note);
+ pitch_group_add_pitch (&scherzo->notes_pressed, pitch);
if (scherzo->pedal_pressed)
- note_group_add_note (&scherzo->notes_pedaled, note);
+ pitch_group_add_pitch (&scherzo->notes_pedaled, pitch);
- scherzo_analyze_chord (scherzo);
+ /* Remove all notes from score, then add current notes. */
+ score_remove_notes (scherzo->score);
- return note;
+ for (i = 0; i < scherzo->notes_pressed.num_pitches; i++)
+ {
+ score_add_note (scherzo->score, scherzo->notes_pressed.pitches[i],
+ SCORE_DURATION_WHOLE);
+ }
+
+ for (i = 0; i < scherzo->notes_pedaled.num_pitches; i++)
+ {
+ score_add_note (scherzo->score, scherzo->notes_pedaled.pitches[i],
+ SCORE_DURATION_WHOLE);
+ }
+
+ scherzo_analyze_chord (scherzo);
}
static void
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];
- note_midi = _pitch_to_midi (note->pitch);
- if (note_midi == target_midi) {
- found = 1;
- if (! scherzo->pedal_pressed)
- score_remove_note (note);
- note_group_remove_note_at (&scherzo->notes_pressed, i);
- }
- }
+ pitch_group_remove_pitch (&scherzo->notes_pressed, pitch);
- if (found == 0) {
- fprintf (stderr, "Internal error: Failed to find note to release.\n");
- }
-
- scherzo_analyze_chord (scherzo);
+ if (scherzo->notes_pressed.num_pitches == 0)
+ scherzo_update_notes_and_chord (scherzo);
}
-static score_note_t *
+static pitch_t
scherzo_press_note_midi (scherzo_t *scherzo, unsigned char midi_note)
{
- return scherzo_press_note (scherzo, _midi_to_pitch (midi_note));
+ pitch_t pitch = _midi_to_pitch (midi_note);
+
+ scherzo_press_note (scherzo, pitch);
+
+ return pitch;
}
static void
scherzo->pedal_pressed = 1;
/* Copy all pressed notes to pedaled notes */
- for (i = 0; i < scherzo->notes_pressed.num_notes; i++)
- note_group_add_note (&scherzo->notes_pedaled, scherzo->notes_pressed.notes[i]);
+ for (i = 0; i < scherzo->notes_pressed.num_pitches; i++)
+ pitch_group_add_pitch (&scherzo->notes_pedaled, scherzo->notes_pressed.pitches[i]);
}
static void
scherzo_release_pedal (scherzo_t *scherzo)
{
- score_note_t *note, *new_note;
int i;
- /* 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->duration);
- scherzo->notes_pressed.notes[i] = new_note;
- }
-
- /* Then remove all previously pedaled notes from the score. */
- for (i = scherzo->notes_pedaled.num_notes - 1; i >=0; i--) {
- note = scherzo->notes_pedaled.notes[i];
- score_remove_note (note);
- note_group_remove_note_at (&scherzo->notes_pedaled, i);
- }
+ /* Remove all previously pedaled notes. */
+ for (i = scherzo->notes_pedaled.num_pitches - 1; i >=0; i--)
+ pitch_group_remove_pitch_at (&scherzo->notes_pedaled, i);
scherzo->pedal_pressed = 0;
- scherzo_analyze_chord (scherzo);
-
- gtk_widget_queue_draw (scherzo->window);
+ scherzo_update_notes_and_chord (scherzo);
}
void
pitch = PITCH (pitch_name, PITCH_ACCIDENTAL_NATURAL, octave);
- challenge->note = score_add_note (challenge->staff, pitch,
- SCORE_DURATION_WHOLE);
+ challenge->note = score_staff_add_note (challenge->staff, pitch,
+ SCORE_DURATION_WHOLE);
challenge->satisfied = 0;
challenge->mistaken = 0;
}
/* Determine whether the user hit the correct note. */
static void
-_judge_note (scherzo_t *scherzo, score_note_t *note)
+_judge_pitch (scherzo_t *scherzo, pitch_t pitch)
{
challenge_t *challenge = &scherzo->challenge;
- if (! scherzo->challenge.note) {
- score_set_note_color_rgb (note, 0.0, 0.0, 0.0); /* black */
+ if (! challenge->note)
return;
- }
- if (note->pitch == challenge->note->pitch)
- {
+ if (pitch == challenge->note->pitch)
challenge->satisfied = 1;
- score_set_note_color_rgb (note, 18/256., 130/256., 28/256.); /* green */
- }
else
- {
challenge->mistaken = 1;
- score_set_note_color_rgb (note, 184/256., 4/256., 22/256.); /* red */
- }
}
/* If the user got the right note (eventually), then score it in
scherzo_t *scherzo = user_data;
ssize_t remaining;
snd_seq_event_t event;
- score_note_t *note;
+ pitch_t pitch;
int need_redraw = FALSE;
remaining = read (scherzo->midi_fd, buf, MIDI_BUF_SIZE);
/* Incomplete event. Nothing to do. */
break;
case SND_SEQ_EVENT_NOTEON:
- note = scherzo_press_note_midi (scherzo, event.data.note.note);
- _judge_note (scherzo, note);
+ pitch = scherzo_press_note_midi (scherzo, event.data.note.note);
+ _judge_pitch (scherzo, pitch);
need_redraw = TRUE;
break;
case SND_SEQ_EVENT_NOTEOFF:
scherzo.keyboard_octave = 4;
scherzo.keyboard_accidental = PITCH_ACCIDENTAL_NATURAL;
- note_group_init (scherzo.ctx, &scherzo.notes_pressed);
- note_group_init (scherzo.ctx, &scherzo.notes_pedaled);
+ pitch_group_init (scherzo.ctx, &scherzo.notes_pressed);
+ pitch_group_init (scherzo.ctx, &scherzo.notes_pedaled);
scherzo.pedal_pressed = 0;
projects / scherzo / blobdiff