-/*
- 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"
last_processed_mom_ = -1;
}
-Simple_music_iterator::Simple_music_iterator (Simple_music_iterator const &src)
- : Music_iterator (src)
-{
- last_processed_mom_ = src.last_processed_mom_;
-}
-
bool
Simple_music_iterator::ok ()const
{
- return last_processed_mom_ < music_length_mom ();
+ 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 (music_l_)
+ if (last_processed_mom_ < Moment (0))
return Moment (0);
else
- return music_length_mom ();
-}
-
-void
-Simple_music_iterator::skip (Moment m)
-{
- music_l_ = 0;
- last_processed_mom_ = m;
+ return music_get_length ();
}
void
Simple_music_iterator::process (Moment m)
{
-#if 0
/*
- try_music () causes trouble for base classes
- */
- if (music_l_)
- {
- bool b = try_music (music_l_);
- if (!b)
- music_l_->origin ()->warning (_f ("Junking music: `%s'",
- classname (music_l_)));
- }
-#endif
- skip (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);