2003 -> 2004

[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 963faf2d07e0508badc5900df1c92b2e8252bef2..c1d707600c67b8bd7124eb0b2f22a8a76accf33f 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,44 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH
 #define SEQUENTIAL_MUSIC_ITERATOR_HH
 
-#include "music-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_iterator
+class Sequential_music_iterator :  public Sequential_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
-  Sequential_music_iterator ();
-  Sequential_music_iterator (Sequential_music_iterator const&);
-  virtual ~Sequential_music_iterator ();
-
-  virtual void construct_children ();
-  virtual Moment pending_moment () const;
-  virtual bool ok () const;
-  virtual void skip (Moment);
-  virtual SCM get_music (Moment)const;
-
-protected:
-  virtual void process (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
-
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 private:
-  Moment here_mom_;
-  SCM cursor_;
-  Music_iterator * iter_p_;
-
-  void next_element ();
-  void descend_to_child ();
+  virtual SCM get_music_list()const;
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH