* The grand 2005-2006 replace.

[lilypond.git] / lily / output-property-music-iterator.cc

diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc
index f2376b6b8c7eebeab0802571a2b25739b37e2bd2..feffeedd2f61cf6b8e2ec2cdf85c898207558491 100644 (file)
--- a/lily/output-property-music-iterator.cc
+++ b/lily/output-property-music-iterator.cc
@@ -3,23 +3,33 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "input.hh"
-#include "music-list.hh"
-#include "output-property-music-iterator.hh"
+#include "simple-music-iterator.hh"
+#include "music.hh"
+
+class Output_property_music_iterator : public Simple_music_iterator
+{
+public:  
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+protected:
+  virtual void process (Moment);
+};
+
 
 void
 Output_property_music_iterator::process (Moment m)
 {
   if (last_processed_mom_ < Moment (0))
     {
-      bool accepted = try_music (music_l_);
+      bool accepted = try_music (get_music ());
       if (!accepted)
-       music_l_->origin ()->warning (_f ("Junking request: `%s'",
-                                         classname (music_l_)));
+       get_music ()->origin ()->warning (_f ("junking event: `%s'",
+                                             get_music ()->class_name ()));
     }
-
-  skip (m);
+  Simple_music_iterator::process (m);
 }
+
+IMPLEMENT_CTOR_CALLBACK (Output_property_music_iterator);