X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=score.c;fp=score.c;h=0c868c6f4a255b93787533db9cb6a80a6ff85919;hb=e77d712bf9f99c3d95f909621ae177b9f8175163;hp=e587c2799ed93a6396456b8d929388d56f482a30;hpb=659845dcf5781c10a2b292f0b7f6fe372874ff8a;p=scherzo diff --git a/score.c b/score.c index e587c27..0c868c6 100644 --- a/score.c +++ b/score.c @@ -178,9 +178,10 @@ static double _score_note_to_line (score_staff_t *staff, score_note_t *note) { pitch_name_t name = PITCH_NAME (note->pitch); + int octave = PITCH_OCTAVE (note->pitch); int c_line = _score_clef_c_line (staff->clef); - return c_line - (name - PITCH_NAME_C) / 2.0 - 3.5 * (note->octave - 4); + return c_line - (name - PITCH_NAME_C) / 2.0 - 3.5 * (octave - 4); } /* chord->width is updated as a side effect */ @@ -595,7 +596,6 @@ score_remove_chord (score_chord_t *chord) score_note_t * score_add_note (score_staff_t *staff, pitch_t pitch, - int octave, score_duration_t duration) { score_note_t *note; @@ -606,7 +606,6 @@ score_add_note (score_staff_t *staff, for (i = 0; i < staff->num_notes; i++) { note = staff->notes[i]; if (note->pitch == pitch && - note->octave == octave && note->duration == duration) { return note; @@ -619,7 +618,6 @@ score_add_note (score_staff_t *staff, note->staff = staff; note->pitch = pitch; - note->octave = octave; note->duration = duration; note->color.r = 0.0; @@ -694,7 +692,6 @@ score_set_note_color_rgb (score_note_t *note, score_note_t * score_staff_find_note (score_staff_t *staff, pitch_t pitch, - int octave, score_duration_t duration) { int i; @@ -702,12 +699,8 @@ score_staff_find_note (score_staff_t *staff, for (i = 0; i < staff->num_notes; i++) { note = staff->notes[i]; - if (note->pitch == pitch && - note->octave == octave && - note->duration == duration) - { + if (note->pitch == pitch && note->duration == duration) return note; - } } return NULL;