X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsequential-music-iterator.hh;h=b327fcfa96622331b17aad9ab8a84a5477d1ce30;hb=d565eec0e4b9ecbfef333802a28435b1f54e8257;hp=a027ad2fe5a6c23a000e152c24b4208871ecf6cd;hpb=74e65211d6cda3818a6d4891f1f1c31f457e94cd;p=lilypond.git

diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh
index a027ad2fe5..b327fcfa96 100644
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,43 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
 #define SEQUENTIAL_MUSIC_ITERATOR_HH
 
-#include "music-list-iterator.hh"
+#include "sequential-iterator.hh"
 
 /** Sequential_music iteration: walk each element in turn, and
   construct an iterator for every element.
   
  */
-class Sequential_music_iterator :  public Music_list_iterator
+class Sequential_music_iterator :  public Sequential_iterator
 {
 public:
-  Sequential_music_iterator ();
-  virtual ~Sequential_music_iterator ();
-
-  virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual bool ok () const;
-
-protected:
-  virtual void do_print() const;
-  virtual void do_process_and_next (Moment);
-
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 private:
-  Moment here_mom_;
-  Cons<Music> *cursor_;
-  Music_iterator * iter_p_;
-
-  /*
-    perhaps these can be virtual and protected iso. private?  
-   */
-  void start_next_element();
-  void leave_element();
-  void set_Sequential_music_translator();
+  virtual SCM get_music_list()const;
+  virtual void descend_to_child ();
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH