* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

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

diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc
index 9228afb104363fc368584cfaa4cbe293c26765a5..b7d3bc826e5ff52777306766e548d36da6f5369d 100644 (file)
--- a/lily/chord-tremolo-iterator.cc
+++ b/lily/chord-tremolo-iterator.cc
@@ -1,83 +1,84 @@
-/*   
-  chord-tremolo-iterator.cc --  implement Chord_tremolo_iterator
-  
+/*
+  chord-tremolo-iterator.cc -- implement Chord_tremolo_iterator
+
   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>
+*/
 
-/*
-  this is culled from various other iterators, but sharing code by
-  subclassing proved to be too difficult.
- */
+#include "chord-tremolo-iterator.hh"
 
 #include "input.hh"
-#include "chord-tremolo-iterator.hh"
 #include "repeated-music.hh"
 
 void
 Chord_tremolo_iterator::construct_children ()
 {
-  Repeated_music * rep = dynamic_cast<Repeated_music*> (music_l ());
-  factor_  = Moment (Rational(1, rep->repeat_count ()));
-  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;
 }
 
-Chord_tremolo_iterator::Chord_tremolo_iterator (Chord_tremolo_iterator const &src)
-  : Music_iterator (src)
+void
+Chord_tremolo_iterator::do_quit ()
+{
+  if (child_iter_)
+    child_iter_->quit ();
+}
+
+void
+Chord_tremolo_iterator::derived_mark () const
 {
-  factor_ = src.factor_;
-  child_iter_p_ = src.child_iter_p_ ? src.child_iter_p_->clone () : 0; 
+  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 () )
+  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 ();
+  return child_iter_ && child_iter_->ok ();
 }
 
-Chord_tremolo_iterator::~Chord_tremolo_iterator ()
+Music_iterator *
+Chord_tremolo_iterator::try_music_in_children (Music *m) const
 {
-  delete child_iter_p_;
+  return child_iter_->try_music (m);
 }
 
-Music_iterator*
-Chord_tremolo_iterator::try_music_in_children (Music  *m) const
-{
-  return child_iter_p_->try_music (m);
-}
-
-
-
 IMPLEMENT_CTOR_CALLBACK (Chord_tremolo_iterator);