X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeaming-pattern.cc;h=37ef6ee614e76cf52629e7ebb073a0c88f536fc4;hb=c1ea7b13aea6297018375ed3571753a6c36714ab;hp=ba5b8a4a72dee519ba9e1f254c61523e698cc6f7;hpb=3ee551fa4f2a2c3736a06f9f85f29b9f7bd89818;p=lilypond.git diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc index ba5b8a4a72..37ef6ee614 100644 --- a/lily/beaming-pattern.cc +++ b/lily/beaming-pattern.cc @@ -69,7 +69,6 @@ Beaming_pattern::best_splitpoint_index (bool *at_boundary) const int min_den = INT_MAX; int min_index = -1; - Moment beat_pos; for (vsize i = 1; i < infos_.size (); i++) { Moment dt = infos_[i].start_moment_ - infos_[i].beat_start_; @@ -125,7 +124,7 @@ Beaming_pattern::beamify (Beaming_options const &options) de_grace (); if (infos_[0].start_moment_ < Moment (0)) - for (vsize i = 0; i < infos_.size(); i++) + for (vsize i = 0; i < infos_.size (); i++) infos_[i].start_moment_ += options.measure_length_; Moment measure_pos (0); @@ -134,7 +133,7 @@ Beaming_pattern::beamify (Beaming_options const &options) vector beat_starts; SCM grouping = options.grouping_; - while (measure_pos <= infos_.back().start_moment_) + while (measure_pos <= infos_.back ().start_moment_) { int count = 2; if (scm_is_pair (grouping)) @@ -153,9 +152,9 @@ Beaming_pattern::beamify (Beaming_options const &options) vsize j = 0; vsize k = 0; - for (vsize i = 0; i < infos_.size(); i++) + for (vsize i = 0; i < infos_.size (); i++) { - while (j + 1 < group_starts.size() + while (j + 1 < group_starts.size () && group_starts[j+1] <= infos_[i].start_moment_) j++; @@ -163,11 +162,11 @@ Beaming_pattern::beamify (Beaming_options const &options) infos_[i].group_start_ = group_starts[j]; infos_[i].beat_length_ = options.beat_length_; - while (k + 1 < beat_starts.size() + while (k + 1 < beat_starts.size () && beat_starts[k+1] <= infos_[i].start_moment_) k++; - if (k < beat_starts.size()) + if (k < beat_starts.size ()) infos_[i].beat_start_ = beat_starts[k]; }