2003 -> 2004

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

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index 324c9b952ab95815af37b5136542e33b910b5de7..05b12283ba34e9b783c52204745eab935611807e 100644 (file)
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #ifndef SIMPLE_MUSIC_ITERATOR_HH
@@ -11,15 +11,22 @@
 
 #include "music-iterator.hh"
 
+/*
+  Iterator for atomic music objects: events are generated at the
+  beginning and at the end of the music.
+  
+ */
 class Simple_music_iterator : public Music_iterator
 {
+protected:
+
+  Moment last_processed_mom_;
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ()); 
   Simple_music_iterator ();
-  Simple_music_iterator (Simple_music_iterator const &);
-
-protected:
-  virtual void do_process_and_next (Moment );
+  virtual void process (Moment);
+  virtual bool ok ()const;
+  virtual Moment pending_moment ()const;
 };
 
 #endif /* SIMPLE_MUSIC_ITERATOR_HH */