* Another grand 2003 update.

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

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 96ec9147602aefee7c6f6471f09521df8a5bb4b4..c31a5d73044360299a2047ed02c4e2c33ced858b 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,37 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #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:
-
+  VIRTUAL_COPY_CONS (Music_iterator);
+  Simultaneous_music_iterator ();
+  Simultaneous_music_iterator (Simultaneous_music_iterator const&);
+  virtual void derived_mark () const;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
+  
   /// make a new context for every child.
   bool separate_contexts_b_;
-  
-  Simultaneous_music_iterator ();
-  virtual ~Simultaneous_music_iterator ();
 
   virtual void construct_children ();
-  virtual Moment next_moment () const;
+  virtual Moment pending_moment () const;
+  virtual void do_quit(); 
   virtual bool ok () const;
+  virtual SCM get_pending_events (Moment)const;
+  virtual void skip (Moment);
 
 protected:
-  virtual void do_print () const;
-  virtual void do_process_and_next (Moment);
-  virtual Music_iterator *try_music_in_children (Music const*) const;
-
+  virtual void process (Moment);
+  virtual Music_iterator *try_music_in_children (Music *) const;
 
 private:
-  Cons_list<Music_iterator> children_p_list_;
+  SCM children_list_;
 };
 
 #endif // SIMULTANEOUS_MUSIC_ITERATOR_HH