-/*
- simple-music-iterator.cc -- implement Simple_music_iterator
-
+/*
+ simple-music-iterator.cc -- implement Simple_music_iterator
+
source file of the GNU LilyPond music typesetter
-
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+
+ (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
#include "simple-music-iterator.hh"
+
#include "music.hh"
#include "input.hh"
+Simple_music_iterator::Simple_music_iterator ()
+ : Music_iterator ()
+{
+ last_processed_mom_ = -1;
+}
+
+bool
+Simple_music_iterator::ok ()const
+{
+ return last_processed_mom_ < music_get_length ();
+}
+
+/*
+ TODO: remove last_processed_mom_, and the complete shit. We should
+ only process a simple-music once, and that is at its start.
+
+ Engravers can detect and event the end-moments to be processed as
+ well.
+*/
+Moment
+Simple_music_iterator::pending_moment ()const
+{
+ if (last_processed_mom_ < Moment (0))
+ return Moment (0);
+ else
+ return music_get_length ();
+}
void
-Simple_music_iterator::do_process_and_next (Moment m)
+Simple_music_iterator::process (Moment m)
{
- if (ok ())
- {
- bool b = try_music (get_music ());
- if (!b)
- music_l_->origin ()->warning (_f ("Junking music: `%s'",
- classname (music_l_)));
-
- }
- Music_iterator::do_process_and_next (m);
+ /*
+ don't do report_event (), since it would make the function useless for
+ base classes
+ */
+
+ last_processed_mom_ = m;
}
+
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);