Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond into

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

diff --git a/lily/include/rhythmic-music-iterator.hh b/lily/include/rhythmic-music-iterator.hh
index 6c6b7c66155c3b045ce0f57aa83c08d4c8983599..c2a5f851fc7c24b32f097ef34b5ac3dfe35d23f8 100644 (file)
--- a/lily/include/rhythmic-music-iterator.hh
+++ b/lily/include/rhythmic-music-iterator.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2012 Mike Solomon <mike@apollinemike.com>
+  Copyright (C) 2012 Mike Solomon <mike@mikesolomon.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,21 +23,21 @@
 #include "simple-music-iterator.hh"
 
 /*
-  Iterator for atomic music objects: events are generated at the
-  beginning and at the end of the music.
+  Iterator for rhythmic music events that are not enclosed by EventChord
 */
 class Rhythmic_music_iterator : public Simple_music_iterator
 {
 protected:
   DECLARE_CLASSNAME (Rhythmic_music_iterator);
-  //Moment last_processed_mom_;
 
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   Rhythmic_music_iterator ();
+  Rhythmic_music_iterator (Rhythmic_music_iterator const &);
+
+protected:
   virtual void process (Moment);
-  //virtual bool ok ()const;
-  //virtual Moment pending_moment ()const;
+  virtual void construct_children ();
 };
 
 #endif /* RHYTHMIC_MUSIC_ITERATOR_HH */