X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=05425a7ab141612294f94c079545757d1e2d201d;hb=24bfffc3b5da5d82eb9b20eb0a0d1e6ff3a1a7d3;hp=e3364847d0a2a36f562a7641b4943618ebffc990;hpb=8e7c61da2807da363e25c2d80bd0d69616dadea8;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index e3364847d0..05425a7ab1 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,29 +13,45 @@
   subclassing proved to be too difficult.
  */
 
-#include "input.hh"
 #include "chord-tremolo-iterator.hh"
+
+#include "input.hh"
 #include "repeated-music.hh"
 
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l ());
-  factor_  = Moment (Rational(1, 1));
-  child_iter_p_ = get_iterator_p (rep->body ());
+  Music *m = get_music();
+  
+  factor_  = Moment (Rational (1, 1));
+  child_iter_ = unsmob_iterator (get_iterator (Repeated_music::body (m)));
 }
 
 Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
   factor_ = 1;
-  child_iter_p_ = 0;
+  child_iter_ = 0;
+}
+
+void
+Chord_tremolo_iterator::do_quit ()
+{
+  if (child_iter_)
+    child_iter_->quit ();
+}
+
+void
+Chord_tremolo_iterator::derived_mark () const
+{
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
+void
+Chord_tremolo_iterator::derived_substitute (Context *f, Context *t) 
 {
-  factor_ = src.factor_;
-  child_iter_p_ = src.child_iter_p_ ? src.child_iter_p_->clone () : 0; 
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
 }
 
 void
@@ -43,40 +59,33 @@ Chord_tremolo_iterator::process (Moment 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_context (yeah->get_outlet ());
       else
-	music_l ()->origin ()->warning (_ ("no one to print a tremolos"));
+	get_music ()->origin ()->warning (_ ("no one to print a tremolos"));
     }
 
-  child_iter_p_->process (factor_ * m);
+  child_iter_->process (factor_ * m);
 }
 
 Moment
 Chord_tremolo_iterator::pending_moment () const
 {
-  return child_iter_p_->pending_moment () / factor_;
+  return child_iter_->pending_moment () / factor_;
 }
 
 bool
 Chord_tremolo_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
-}
-
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
-{
-  delete child_iter_p_;
+  return child_iter_ && child_iter_->ok ();
 }
 
 Music_iterator*
 Chord_tremolo_iterator::try_music_in_children (Music  *m) const
 {
-  return child_iter_p_->try_music (m);
+  return child_iter_->try_music (m);
 }
 
-
-
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);