2003 -> 2004

[lilypond.git] / lily / time-scaled-music-iterator.cc

diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index fc48ff2cd662b3dffc1f23fa768c582d758517dc..7bd174bc02f27903ed00bd658558777d6ef494b1 100644 (file)
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -3,27 +3,29 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "time-scaled-music-iterator.hh"
 #include "time-scaled-music.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "translator-group.hh"
-#include "command-request.hh"
+
 
 void
-Time_scaled_music_iterator::do_process_and_next (Moment m)
+Time_scaled_music_iterator::process (Moment m)
 {
-  if (!m)
+  if (!m.to_bool ())
     {
-      Music_iterator *yeah = try_music (music_l_);
+      Music_iterator *yeah = try_music (get_music ());
       if (yeah)
-       set_translator (yeah->report_to_l ());
+       set_translator (yeah->get_outlet ());
       else
-       music_l_->warning ( _("No one to print a tuplet start bracket"));
+       get_music ()->origin ()->warning (_ ("no one to print a tuplet start bracket"));
     }
 
-  Music_wrapper_iterator::do_process_and_next (m);
+  Music_wrapper_iterator::process (m);
 }
+ 
+IMPLEMENT_CTOR_CALLBACK (Time_scaled_music_iterator);