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 8888e462b95721051e1160afd3cfe0a978245a5e..c1d707600c67b8bd7124eb0b2f22a8a76accf33f 100644 (file)
--- a/lily/include/sequential-music-iterator.hh
+++ b/lily/include/sequential-music-iterator.hh
@@ -3,48 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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:
-  Sequential_music_iterator ();
-  virtual ~Sequential_music_iterator ();
-
-  virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual bool ok () const;
-
-  virtual Music* get_next_music ();
-
-protected:
-  virtual void do_print() const;
-  virtual void do_process_and_next (Moment);
-  virtual Music_iterator *try_music_in_children (Music *) const;
-
-
+  DECLARE_SCHEME_CALLBACK(constructor, ());
 private:
-  Moment here_mom_;
-
-  SCM 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;
 };
 
 #endif // SEQUENTIAL_MUSIC_ITERATOR_HH