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

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index b185f8ac24..c89f0f52be 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -1,13 +1,13 @@
-/*   
-  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"
 
@@ -17,55 +17,37 @@ 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_;
-}
-
-void
-Simple_music_iterator::skip (Moment m)
-{
-  music_l_ = 0;
-  last_processed_mom_ = m;
+    return music_get_length ();
 }
 
 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 report_event (), since it would make the function useless for
+    base classes
+  */
+
+  last_processed_mom_ = m;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);