X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=9de2bb6af7819d21ab708ec25c541a744c0c259c;hb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;hp=e5774c9f32221881dc72a1b33ef83fc0e2caa5fd;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index e5774c9f32..9de2bb6af7 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -114,7 +114,7 @@ Music_iterator::ok() const } Music_iterator* -Music_iterator::static_get_iterator_p (Music const *m, bool playing) +Music_iterator::static_get_iterator_p (Music const *m) { Music_iterator * p =0; @@ -142,15 +142,14 @@ Music_iterator::static_get_iterator_p (Music const *m, bool playing) p = new Music_wrapper_iterator; else if (Repeated_music const * n = dynamic_cast (m)) { - if (n->fold_b_ && !playing) + if (n->fold_b_) p = new Folded_repeat_iterator; else p = new Unfolded_repeat_iterator; } else assert (0); - - p->playback_b_ = playing; + p->music_l_ = m; return p; @@ -177,7 +176,7 @@ Music_iterator::init_translator (Music const *m, Translator_group *report_l) Music_iterator* Music_iterator::get_iterator_p (Music const*m) const { - Music_iterator*p = static_get_iterator_p (m, playback_b_); + Music_iterator*p = static_get_iterator_p (m); p->init_translator (m, report_to_l()); p->construct_children(); @@ -186,7 +185,6 @@ Music_iterator::get_iterator_p (Music const*m) const Music_iterator::Music_iterator() { - playback_b_ = false; first_b_ = true; }