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 e919d4b5a0b23939a1b15a24f09420a8e5afce08..ed118ec11fedfa9605f908ef81ac91ef289e14d8 100644 (file)
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -21,45 +21,38 @@ Simple_music_iterator::Simple_music_iterator (Simple_music_iterator const &src)
   : Music_iterator (src)
 {
   last_processed_mom_ = src.last_processed_mom_;
-  length_mom_ = src.length_mom_;
-}
-
-void
-Simple_music_iterator::construct_children ()
-{
-  length_mom_ = music_l_->length_mom ();
 }
 
 bool
 Simple_music_iterator::ok ()const
 {
-  return last_processed_mom_ < length_mom_;
+  return last_processed_mom_ < music_length_mom ();
 }
 
 Moment
 Simple_music_iterator::pending_moment ()const
 {
-  if (music_l_)
+  if (last_processed_mom_ < Moment (0))
     return Moment (0);
   else
-    return length_mom_;
+    return music_length_mom ();
 }
 
 void
-Simple_music_iterator::process (Moment m)
+Simple_music_iterator::skip (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
   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);