- if (accidental < 0 || accidental > SCORE_PITCH_ACCIDENTAL_DOUBLE_SHARP) {
+ 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);
}
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 = SCORE_PITCH (name, accidental);
+ note->pitch = PITCH (name, accidental);
}
static void
_spell_chord_by_signature (note_group_t *chord,
int num_notes,
chord_signature_t *signature,
}
static void
_spell_chord_by_signature (note_group_t *chord,
int num_notes,
chord_signature_t *signature,
- score_pitch_t root)
+ 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. */
{
int i, degree, note_half_steps, degree_half_steps;
int root_midi;
/* Sanitize root to eliminate things like double-flats,