X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=1db36ee580657253103f3cccc1f5e06698224ac0;hb=266a1dfe19ef50999bec6543f261ce340f2bc808;hp=d5ed47629c241bc482e4a7bde8338bfca3355d8d;hpb=615a9212789c2cb2994748c023d0e19f3a83a0fd;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index d5ed47629c..1db36ee580 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -3,59 +3,76 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 
 #include "music-wrapper-iterator.hh"
+
 #include "music-wrapper.hh"
 
 Music_wrapper_iterator::Music_wrapper_iterator ()
 {
-  child_iter_p_ =0;
+  child_iter_ = 0;
 }
 
-
-
 void
-Music_wrapper_iterator::do_print () const
+Music_wrapper_iterator::do_quit ()
 {
-  child_iter_p_->print ();
+  child_iter_->quit ();
 }
 
 void
-Music_wrapper_iterator::construct_children ()
+Music_wrapper_iterator::derived_mark () const
 {
-  child_iter_p_ = get_iterator_p (music_wrapper_l ()->element_p_);  
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+void
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t) 
 {
-  delete child_iter_p_;
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
 }
 
-Music_wrapper*
-Music_wrapper_iterator::music_wrapper_l ()
+void
+Music_wrapper_iterator::construct_children ()
 {
-  return (Music_wrapper*) music_l_;
+  Music * m =  dynamic_cast<Music_wrapper const*> (get_music ())-> element ();  
+  child_iter_ = unsmob_iterator (get_iterator (m));
 }
+
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
 
+
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
+Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
+  child_iter_->process (m);
 }
 
+
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
+{
+  return child_iter_->pending_moment ();
+}
+
+Music_iterator*
+Music_wrapper_iterator::try_music_in_children (Music *m) const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_->try_music (m);
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
+
+bool
+Music_wrapper_iterator::run_always () const
+{
+  return child_iter_->run_always ();
+}