X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fsimultaneous-music-iterator.hh;h=790e96806aabf393593f7bfc6e71f4113f0f3bfa;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=9640d92dd8add880beb770c4b7fac722c7295dec;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh
index 9640d92dd8..790e96806a 100644
--- a/lily/include/simultaneous-music-iterator.hh
+++ b/lily/include/simultaneous-music-iterator.hh
@@ -3,31 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 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-list-iterator.hh"
+#include "music-iterator.hh"
 
-class Simultaneous_music_iterator : public Music_list_iterator
+class Simultaneous_music_iterator : public Music_iterator
 {
 public:
   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, ());
+  DECLARE_CLASSNAME(Simultaneous_music_iterator);
+
+  /// 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);
 
 private:
-  Pointer_list<Music_iterator*> children_p_list_;
+  SCM children_list_;
 };
 
 #endif // SIMULTANEOUS_MUSIC_ITERATOR_HH