X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimultaneous-music-iterator.hh;h=0fdb31e688780f24b90fb6f5720c11d79b7675b5;hb=5b9067e9603298292b420f27a0a665a836bd3644;hp=6c4008a95b619682a50f72b28dab0fde8ba7a28d;hpb=9661ba1fb275f3e14f8a69f2cee2f02a2f893e48;p=lilypond.git diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh index 6c4008a95b..0fdb31e688 100644 --- a/lily/include/simultaneous-music-iterator.hh +++ b/lily/include/simultaneous-music-iterator.hh @@ -3,37 +3,39 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #ifndef SIMULTANEOUS_MUSIC_ITERATOR_HH #define SIMULTANEOUS_MUSIC_ITERATOR_HH + #include "music-iterator.hh" -#include "cons.hh" class Simultaneous_music_iterator : public Music_iterator { public: - - /// make a new context for every child. - bool separate_contexts_b_; - Simultaneous_music_iterator (); - virtual ~Simultaneous_music_iterator (); + Simultaneous_music_iterator (Simultaneous_music_iterator const&); + virtual void derived_substitute (Context *f, Context *t) ; + virtual void derived_mark () const; + DECLARE_SCHEME_CALLBACK(constructor, ()); + + /// make a new context for every child. + bool create_separate_contexts_; virtual void construct_children (); - virtual Moment next_moment () const; + virtual Moment pending_moment () const; + virtual void do_quit(); virtual bool ok () const; - + virtual bool run_always () const; + protected: - virtual void do_print () const; - virtual void do_process_and_next (Moment); + virtual void process (Moment); virtual Music_iterator *try_music_in_children (Music *) const; - private: - Cons_list children_p_list_; + SCM children_list_; }; #endif // SIMULTANEOUS_MUSIC_ITERATOR_HH