* The grand 2005-2006 replace.

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

diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh
index 8cf39854c840dec1b9f929545a1b2016325d60ae..a70d7bcd4009ddec3d41ca165e7b49f6a44a06be 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,45 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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
+    construct an iterator for every element.
+*/
+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:
-  Sequential_music* sequential_music_l () const;
-
-  virtual void do_print() const;
-  virtual void do_process_and_next (Moment);
-
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  DECLARE_CLASSNAME(Sequential_music_iterator);
 private:
-  Moment here_mom_;
-  PCursor<Music*> *cursor_p_;
-  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;
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH