* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / include / lyric-combine-music-iterator.hh

diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh
index 31a47b489655b0a072531619add3994e82eaefdb..e85fc6ab635f09c9955d84dc5fcf4c5f425281ca 100644 (file)
--- a/lily/include/lyric-combine-music-iterator.hh
+++ b/lily/include/lyric-combine-music-iterator.hh
@@ -4,7 +4,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -18,20 +18,21 @@ class Lyric_combine_music_iterator : public Music_iterator
 public:
   VIRTUAL_COPY_CONS (Music_iterator);
   Lyric_combine_music_iterator ();
-
+  Lyric_combine_music_iterator (Lyric_combine_music_iterator const&src);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 protected:
   virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual void do_process_and_next (Moment);
+  virtual Moment pending_moment () const;
+  virtual void do_quit(); 
+  virtual void process (Moment);
   virtual Music_iterator *try_music_in_children (Music *) const;
-
+  
   virtual bool ok () const;
-  virtual void do_print () const;
-  virtual ~Lyric_combine_music_iterator ();
-
+  virtual void derived_mark () const;
 private:
-  Music_iterator * music_iter_p_;
-  Music_iterator * lyric_iter_p_;
+  bool get_busy_status ()const ;
+  Music_iterator * music_iter_;
+  Music_iterator * lyric_iter_;
 };
 #endif /* LYRIC_COMBINE_MUSIC_ITERATOR_HH */