X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-music-iterator.cc;h=8345d60d6f123e8cb0c1f0c51d3856a6cdf57a50;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d19d615a22b67ea7dd4e225682e208bcb6d72037;hpb=9b34d4afef6dd3f50c8f9cec1e613eb44f8c7913;p=lilypond.git

diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc
index d19d615a22..8345d60d6f 100644
--- a/lily/simple-music-iterator.cc
+++ b/lily/simple-music-iterator.cc
@@ -1,36 +1,64 @@
-/*   
-  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>
-  
- */
+/*
+  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"
 
 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);