X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ffolded-repeat-iterator.hh;h=5c88ca7dffefab677f23f53cb1b528ee05711951;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=1b36df304ace130b05a3a227518738bffff8bce2;hpb=9b34d4afef6dd3f50c8f9cec1e613eb44f8c7913;p=lilypond.git diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh index 1b36df304a..5c88ca7dff 100644 --- a/lily/include/folded-repeat-iterator.hh +++ b/lily/include/folded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2000 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ @@ -20,24 +20,27 @@ class Folded_repeat_iterator : public Music_iterator { public: VIRTUAL_COPY_CONS (Music_iterator); + static SCM constructor_cxx_function; + + Folded_repeat_iterator (Folded_repeat_iterator const &src); Folded_repeat_iterator (); ~Folded_repeat_iterator (); virtual void construct_children (); - virtual Moment next_moment () const; + virtual Moment pending_moment () const; virtual bool ok () const; protected: void enter_alternative (); void leave_body (); - virtual void do_process_and_next (Moment); + virtual void process (Moment); virtual Music_iterator *try_music_in_children (Music *) const; private: Music_iterator * main_iter_p_; Music_iterator * alternative_iter_p_; - int count_; + Moment main_length_mom_; }; #endif /* FOLDED_REPEAT_ITERATOR_HH */