X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fsimple-music-iterator.hh;h=fd6f5a26005fe880b90dbe3739f9b765ef68e1b7;hb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;hp=1fa5bb7d16dfc906501527536858434cfcbdc6c8;hpb=9b34d4afef6dd3f50c8f9cec1e613eb44f8c7913;p=lilypond.git

diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh
index 1fa5bb7d16..fd6f5a2600 100644
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -1,26 +1,33 @@
-/*   
-  request-iterator.hh -- declare Request_iterator
-  
+/*
+  simple-music-iterator.hh -- declare Simple_music_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#ifndef REQUEST_ITERATOR_HH
-#define REQUEST_ITERATOR_HH
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#ifndef SIMPLE_MUSIC_ITERATOR_HH
+#define SIMPLE_MUSIC_ITERATOR_HH
 
 #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:
+  DECLARE_CLASSNAME(Simple_music_iterator);
+
+  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 /* REQUEST_ITERATOR_HH */
+#endif /* SIMPLE_MUSIC_ITERATOR_HH */