Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh
index e8e9ee186fa96c4ac225f66d920b2ce4d15776ef..379e202f03b977e56a9580b13f006f636cf097e5 100644 (file)
--- a/lily/include/time-scaled-music-iterator.hh
+++ b/lily/include/time-scaled-music-iterator.hh
@@ -3,23 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+                 Erik Sandberg <mandolaerik@gmail.com>
 */
 
-#ifndef Time_scaled_music_ITERATOR_HH
-#define Time_scaled_music_ITERATOR_HH
+#ifndef TIME_SCALED_MUSIC_ITERATOR_HH
+#define TIME_SCALED_MUSIC_ITERATOR_HH
 
-#include "music-wrapper-iterator.hh"
+#include "sequential-iterator.hh"
 
-class Time_scaled_music_iterator : public Music_wrapper_iterator
+class Time_scaled_music_iterator : public Sequential_iterator
 {
 public:
   DECLARE_SCHEME_CALLBACK (constructor, ());
   /* construction */
   DECLARE_CLASSNAME(Time_scaled_music_iterator);
+  Time_scaled_music_iterator ();
 protected:
-  virtual void process (Moment);
+  virtual SCM get_music_list () const;
+private:
 };
 
-#endif /* Time_scaled_music_ITERATOR_HH */
-
+#endif /* TIME_SCALED_MUSIC_ITERATOR_HH */