release: 1.3.131

[lilypond.git] / lily / chord-tremolo-iterator.cc

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index c74c8be464f778777232f29fe483643c311abfa6..5487f9625129e2d0b74200d2a855aa3ad02a4ec6 100644 (file)
--- 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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,15 +12,16 @@
   this is culled from various other iterators, but sharing code by subclassing proved to be too difficult.
  */
 
+#include "input.hh"
 #include "chord-tremolo-iterator.hh"
 #include "repeated-music.hh"
 
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music const* rep = dynamic_cast<Repeated_music const*> (music_l_);
-  factor_  = Moment (1, rep->repeats_i_);
-  child_iter_p_ = get_iterator_p (rep->repeat_body_p_);
+  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l_);
+  factor_  = Moment (1, rep->repeat_count ());
+  child_iter_p_ = get_iterator_p (rep->body ());
 }
 
 Chord_tremolo_iterator::Chord_tremolo_iterator()
@@ -29,8 +30,14 @@ Chord_tremolo_iterator::Chord_tremolo_iterator()
   child_iter_p_ = 0;
 }
 
+Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
+  : Music_iterator (src)
+{
+  child_iter_p_ = src.child_iter_p_? src.child_iter_p_->clone () : 0; 
+}
+
 void
-Chord_tremolo_iterator::do_process_and_next (Moment m)
+Chord_tremolo_iterator::process (Moment m)
 {
   if (!m)
     {
@@ -38,17 +45,17 @@ Chord_tremolo_iterator::do_process_and_next (Moment m)
       if (yeah)
        set_translator (yeah->report_to_l ());
       else
-       music_l_->warning ( _("no one to print a tremolos"));
+       music_l_->origin ()->warning ( _("no one to print a tremolos"));
     }
 
-  child_iter_p_->process_and_next  (factor_ * m);
+  child_iter_p_->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_p_->pending_moment () / factor_;
 }
 
 bool
@@ -63,14 +70,12 @@ Chord_tremolo_iterator::~Chord_tremolo_iterator ()
 }
 
 Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music const *m) const
+Chord_tremolo_iterator::try_music_in_children (Music  *m) const
 {
   return child_iter_p_->try_music (m);
 }
 
 
-void
-Chord_tremolo_iterator::do_print () const
-{
-  child_iter_p_->print  ();
-}
+
+IMPLEMENT_CTOR_CALLBACK(Chord_tremolo_iterator);
+