X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=1ab5b399c75d199dea0815654b177a936307ea7e;hb=24ac85edabed266d1de42c12971f4e81b4475d7d;hp=0497ef770c78df79c8fd38fcfcdeef1fc26affed;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index 0497ef770c..1ab5b399c7 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -3,11 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "simple-music-iterator.hh"
+
 #include "music.hh"
 #include "input.hh"
 
@@ -17,23 +18,17 @@ 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_;
-}
-
 bool
 Simple_music_iterator::ok ()const
 {
-  return last_processed_mom_ < music_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 request the end-moments to be processed as
+  Engravers can detect and event the end-moments to be processed as
   well.
 
 */
@@ -43,31 +38,19 @@ Simple_music_iterator::pending_moment ()const
   if (last_processed_mom_ < Moment (0))
     return Moment (0);
   else
-    return music_length_mom ();
+    return music_get_length ();
 }
 
-void
-Simple_music_iterator::skip (Moment m)
-{
-  /*
-    docme??!!
-
-    uncommented because setting MUSIC_L_ = 0 causes core dumps with
-    grace notes.  */
-  
-  //  music_l_ = 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 */
+  base classes
+  */
 
-  skip (m);
+  last_processed_mom_ = m;
 }
 
 IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);