X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimultaneous-music-iterator.hh;h=790e96806aabf393593f7bfc6e71f4113f0f3bfa;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=aec5d6494ce054e7dfd5162c9327ceb492c42b37;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index aec5d6494c..790e96806a 100644
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,41 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.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 ~Simultaneous_music_iterator ();
-  static SCM constructor_cxx_function;
-  
+  Simultaneous_music_iterator (Simultaneous_music_iterator const &);
+  virtual void derived_substitute (Context *f, Context *t);
+  virtual void derived_mark () const;
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Simultaneous_music_iterator);
+
   /// make a new context for every child.
-  bool separate_contexts_b_;
-  int cursor_i_;
+  bool create_separate_contexts_;
 
   virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit ();
   virtual bool ok () const;
-  virtual SCM get_music (Moment)const;
-  virtual void skip (Moment);
+  virtual bool run_always () const;
 
 protected:
   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