release: 1.3.107

[lilypond.git] / lily / simple-music-iterator.cc

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index d19d615a22b67ea7dd4e225682e208bcb6d72037..ed118ec11fedfa9605f908ef81ac91ef289e14d8 100644 (file)
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -14,23 +14,45 @@
 Simple_music_iterator::Simple_music_iterator ()
   : Music_iterator ()
 {
+  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 ();
+}
+
+Moment
+Simple_music_iterator::pending_moment ()const
+{
+  if (last_processed_mom_ < Moment (0))
+    return Moment (0);
+  else
+    return music_length_mom ();
 }
 
 void
-Simple_music_iterator::do_process_and_next (Moment m)
+Simple_music_iterator::skip (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);
+  music_l_ = 0;
+  last_processed_mom_ = m;
 }
+
+void
+Simple_music_iterator::process (Moment m)
+{
+  /*
+  don't do try_music (), since it would make the function useless for
+  base classes */
+
+  skip (m);
+}
+
+IMPLEMENT_CTOR_CALLBACK(Simple_music_iterator);