X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=d9bb1f39636594dbcbad5dd64c877bb2c4198fb0;hb=c2d44e3a71b2d031305abede97a53f6e5fcf832b;hp=a8d6ade08351cb16551daf060bd32c4abbeddee8;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index a8d6ade083..d9bb1f3963 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -21,7 +21,7 @@ void
 Chord_tremolo_iterator::construct_children ()
 {
   Repeated_music * rep = dynamic_cast<Repeated_music*> (get_music ());
-  factor_  = Moment (Rational(1, 1));
+  factor_  = Moment (Rational (1, 1));
   child_iter_ = unsmob_iterator (get_iterator (rep->body ()));
 }
 
@@ -31,30 +31,25 @@ Chord_tremolo_iterator::Chord_tremolo_iterator ()
   child_iter_ = 0;
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
+void
+Chord_tremolo_iterator::do_quit ()
 {
-  factor_ = src.factor_;
-  child_iter_ = 0;
-  if (src.child_iter_)
-    {
-      child_iter_ = src.child_iter_->clone ();
-      scm_gc_unprotect_object (child_iter_->self_scm());
-    }
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
-Chord_tremolo_iterator::do_quit()
+Chord_tremolo_iterator::derived_mark () const
 {
   if (child_iter_)
-    child_iter_->quit();
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
 void
-Chord_tremolo_iterator::derived_mark () const
+Chord_tremolo_iterator::derived_substitute (Context *f, Context *t) 
 {
   if (child_iter_)
-    scm_gc_mark (child_iter_->self_scm());
+    child_iter_->substitute_outlet (f,t);
 }
 
 void
@@ -64,7 +59,7 @@ Chord_tremolo_iterator::process (Moment m)
     {
       Music_iterator *yeah = try_music (get_music ());
       if (yeah)
-	set_translator (yeah->report_to ());
+	set_translator (yeah->get_outlet ());
       else
 	get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
     }