``slikken kreng''

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

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index d19d615a22b67ea7dd4e225682e208bcb6d72037..5c7ebc6271d420b5724b7dd568fa8ced5bd65550 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,23 +14,60 @@
 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 ();
+}
+
+/*
+  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 request 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_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);
+  /*
+    docme??!!
+
+    uncommented because setting MUSIC_L_ = 0 causes core dumps with
+    grace notes.  */
+  
+  //  music_ = 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);