X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=8345d60d6f123e8cb0c1f0c51d3856a6cdf57a50;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=712e4745ea266757f08ea2a10dd85d103b90bd5b;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index 712e4745ea..8345d60d6f 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -1,13 +1,24 @@
-/*   
-  simple-music-iterator.cc --  implement Simple_music_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "simple-music-iterator.hh"
+
 #include "music.hh"
 #include "input.hh"
 
@@ -17,42 +28,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_;
-}
-
 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 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_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)
 {
   /*
-  don't do try_music (), since it would make the function useless for
-  base classes */
+    don't do report_event (), since it would make the function useless for
+    base classes
+  */
 
-  skip (m);
+  last_processed_mom_ = m;
 }
 
-IMPLEMENT_CTOR_CALLBACK(Simple_music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Simple_music_iterator);