(An orchestral part): new

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

diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index 13b471ec90cc9893ed98eda7742421cf44bcb281..c9850c33a5280ecf95fc2aa1886b9bd8385ca6a3 100644 (file)
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef SEQUENTIAL_ITERATOR_HH
@@ -54,16 +54,17 @@ public:
   Grace_fixup * grace_fixups_;
   
   VIRTUAL_COPY_CONS (Music_iterator);
-  static SCM constructor_cxx_function;
+  DECLARE_SCHEME_CALLBACK(constructor, ());
   Sequential_iterator ();
   Sequential_iterator (Sequential_iterator const&);
-  virtual ~Sequential_iterator ();
+  virtual void derived_mark () const;
 
   virtual void construct_children ();
   virtual Moment pending_moment () const;
+  virtual void do_quit(); 
   virtual bool ok () const;
   virtual void skip (Moment);
-  virtual SCM get_music (Moment)const;
+  virtual SCM get_pending_events (Moment)const;
 
 protected:
   virtual void process (Moment);
@@ -71,8 +72,8 @@ protected:
 
 protected:
   Moment here_mom_;
-  Music_iterator * iter_p_;
-  Protected_scm  list_;
+  Music_iterator * iter_;
+  SCM  list_;
   SCM cursor_;
   
   virtual void next_element (bool side_effect);