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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 1fe1425527..d9bb1f3963 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--2004 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,59 +20,70 @@
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l_);
-  factor_  = Moment (1, rep->repeats_i_);
-  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;
 }
 
 void
-Chord_tremolo_iterator::do_process_and_next (Moment m)
+Chord_tremolo_iterator::do_quit ()
 {
-  if (!m)
+  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 (Context *f, Context *t) 
+{
+  if (child_iter_)
+    child_iter_->substitute_outlet (f,t);
+}
+
+void
+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_translator (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_and_next  (factor_ * m);
+  child_iter_->process (factor_ * m);
 }
 
-
 Moment
-Chord_tremolo_iterator::next_moment () const
+Chord_tremolo_iterator::pending_moment () const
 {
-  return child_iter_p_->next_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);
 
-void
-Chord_tremolo_iterator::do_print () const
-{
-  child_iter_p_->print  ();
-}