X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=c89f0f52be1d45b270016b12904ebcc11319a375;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d19d615a22b67ea7dd4e225682e208bcb6d72037;hpb=08c8760ee53ee597eaf6ac24dd783af6938d632d;p=lilypond.git

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index d19d615a22..c89f0f52be 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -1,36 +1,53 @@
-/*   
-  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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "simple-music-iterator.hh"
+
 #include "music.hh"
 #include "input.hh"
 
 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)
+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 report_event (), since it would make the function useless for
+    base classes
+  */
+
+  last_processed_mom_ = m;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);