2003 -> 2004

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

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index b185f8ac24b6c97cb0532ba0a49aa138b9947222..6b1dedb55ab05b0af04c7cd06869b57c81771fd4 100644 (file)
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -17,55 +17,39 @@ Simple_music_iterator::Simple_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_;
-  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_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 length_mom_;
+    return music_get_length ();
 }
 
-void
-Simple_music_iterator::skip (Moment m)
-{
-  music_l_ = 0;
-  last_processed_mom_ = m;
-}
 
 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 try_music (), since it would make the function useless for
+  base classes
+  */
+
+  last_processed_mom_ = m;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);