X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-tremolo-iterator.cc;h=ae9a17eb4674ae184c5507b7a92e7c9f73e81855;hb=7095841e441b2ad2d8ca798e6d1d241e57bdd0c5;hp=5ddad9598321aebc7a199ec0747910797ec4e99f;hpb=8da6cef580cce3365b219f6aca429b434cb60fcf;p=lilypond.git

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 5ddad95983..ae9a17eb46 100644
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -3,13 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 
 /*
-  this is culled from various other iterators, but sharing code by subclassing proved to be too difficult.
+  this is culled from various other iterators, but sharing code by
+  subclassing proved to be too difficult.
  */
 
 #include "input.hh"
@@ -19,57 +20,82 @@
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l_);
-  factor_  = Moment (1, rep->repeat_count ());
-  child_iter_p_ = get_iterator_p (rep->body ());
+  Repeated_music * rep = dynamic_cast<Repeated_music*> (get_music ());
+  factor_  = Moment (Rational(1, 1));
+  child_iter_ = unsmob_iterator (get_iterator (rep->body ()));
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator()
+Chord_tremolo_iterator::Chord_tremolo_iterator ()
 {
   factor_ = 1;
-  child_iter_p_ = 0;
+  child_iter_ = 0;
+}
+
+Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
+  : Music_iterator (src)
+{
+  factor_ = src.factor_;
+  child_iter_ = 0;
+  if (src.child_iter_)
+    {
+      child_iter_ = src.child_iter_->clone ();
+      scm_gc_unprotect_object (child_iter_->self_scm());
+    }
+}
+
+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());
+}
+
+void
+Chord_tremolo_iterator::derived_substitute (Translator_group*f, Translator_group*t) 
+{
+  if (child_iter_)
+    child_iter_->substitute_outlet (f,t);
 }
 
 void
 Chord_tremolo_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->report_to ());
       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);
+IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);