2003 -> 2004

[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 fa8ada0ad1c82db16f4553c0e0035517614aba36..fc76c976d4d8fd70734318ce25996221e535f3d8 100644 (file)
--- a/lily/output-property-music-iterator.cc
+++ b/lily/output-property-music-iterator.cc
@@ -3,25 +3,33 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "input.hh"
 #include "music-list.hh"
-#include "output-property-music-iterator.hh"
+#include "simple-music-iterator.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'",
+                                         classname (get_music ())));
     }
-
-  skip (m);
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Output_property_music_iterator);