* VERSION (MY_PATCH_LEVEL): make 1.7.0

[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 00e9f66d4f237fb25903ae153288407843df97db..d154b144614e4a36c2bfe4d8237fe52d516a36d0 100644 (file)
--- a/lily/include/simple-music-iterator.hh
+++ b/lily/include/simple-music-iterator.hh
@@ -1,22 +1,37 @@
 /*   
-  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>
-  
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
-#ifndef REQUEST_ITERATOR_HH
-#define REQUEST_ITERATOR_HH
+#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:
-  virtual void do_process_and_next (Moment );
+
+  Moment last_processed_mom_;
+public:
+  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK(constructor, ()); 
+  Simple_music_iterator ();
+  Simple_music_iterator (Simple_music_iterator const &);
+  virtual void process (Moment);
+  virtual bool ok ()const;
+  virtual Moment pending_moment ()const;
+
+  virtual void skip (Moment);
 };
 
-#endif /* REQUEST_ITERATOR_HH */
+#endif /* SIMPLE_MUSIC_ITERATOR_HH */