X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-scaled-music-iterator.cc;h=06a4f7ab1bec75d73209cdfe017847e12a5ca0c5;hb=1e63e1c8345be830cf76cda3d0c0d91b65a1f3c6;hp=c6a086419e02dbab971b8aedcc132ab4c62f02ac;hpb=8f58f4428d70961938e9151097886d861b3faeb3;p=lilypond.git

diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc
index c6a086419e..06a4f7ab1b 100644
--- a/lily/time-scaled-music-iterator.cc
+++ b/lily/time-scaled-music-iterator.cc
@@ -1,29 +1,28 @@
-/*   
-  time-scaled-music-iterator.cc --  implement Time_scaled_music_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  time-scaled-music-iterator.cc -- implement Time_scaled_music_iterator
 
-#include "time-scaled-music-iterator.hh"
-#include "time-scaled-music.hh"
-#include "musical-request.hh"
-#include "translator-group.hh"
-#include "command-request.hh"
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
+#include "time-scaled-music-iterator.hh"
+#include "context.hh"
+#include "input.hh"
 
 void
-Time_scaled_music_iterator::do_process_and_next (Moment m)
+Time_scaled_music_iterator::process (Moment m)
 {
-  if (first_b_)
+  if (!m.to_bool ())
     {
-      bool success = report_to_l ()->try_music (dynamic_cast<Time_scaled_music const*> (music_l_));
-      if (!success)
-	music_l_->warning ( _("No one to print a tuplet start bracket"));
+      Music_iterator *yeah = try_music (get_music ());
+      if (yeah)
+	set_context (yeah->get_outlet ());
+      else
+	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);