release: 1.5.29

[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 6c4008a95b619682a50f72b28dab0fde8ba7a28d..122a4825adb316053695c67b400e7db8fe7be4cb 100644 (file)
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,35 +3,39 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 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:
-
-  /// make a new context for every child.
-  bool separate_contexts_b_;
-  
+  VIRTUAL_COPY_CONS (Music_iterator);
   Simultaneous_music_iterator ();
+  Simultaneous_music_iterator (Simultaneous_music_iterator const&);
   virtual ~Simultaneous_music_iterator ();
+  static SCM constructor_cxx_function;
+  
+  /// make a new context for every child.
+  bool separate_contexts_b_;
+  int cursor_i_;
 
   virtual void construct_children ();
-  virtual Moment next_moment () const;
+  virtual Moment pending_moment () const;
   virtual bool ok () const;
+  virtual SCM get_music (Moment)const;
+  virtual void skip (Moment);
 
 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<Music_iterator> children_p_list_;
 };