X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=6b1dedb55ab05b0af04c7cd06869b57c81771fd4;hb=f459e523e2df1d26a854b4ff1e1d2f18189a7287;hp=4c925f3c9100c55e666a45f3003672c6ef4f490f;hpb=6798fd9b3d52cbed28b24dbac067bff9af406230;p=lilypond.git

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index 4c925f3c91..6b1dedb55a 100644
--- 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>
   
  */
 
@@ -11,17 +11,45 @@
 #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 try_music (), since it would make the function useless for
+  base classes
+  */
+
+  last_processed_mom_ = m;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);