X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=304497a4893589da0cfb528f8ab3338f81d70ced;hb=38408524c283578cff6d5475ac2776ef81a2dcde;hp=43fe4b495c97ada4d73d6b5bcc9c98c787588294;hpb=6798fd9b3d52cbed28b24dbac067bff9af406230;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 43fe4b495c..304497a489 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,76 +1,77 @@
-/*   
-  music-wrapper-iterator.cc --  implement Music_wrapper_iterator
-  
+/*
+  music-wrapper-iterator.cc -- implement Music_wrapper_iterator
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "music-wrapper-iterator.hh"
 #include "music-wrapper.hh"
+#include "music.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 ();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
 void
-Music_wrapper_iterator::construct_children ()
+Music_wrapper_iterator::derived_mark () const
 {
-  child_iter_p_ =
-    get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element ());
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
-{
-  delete child_iter_p_;
-}
-
-
-bool
-Music_wrapper_iterator::ok () const
+void
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
 }
 
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
+Music_wrapper_iterator::construct_children ()
 {
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
+  Music *my_music = get_music ();
+  Music *child = unsmob_music (my_music->get_property ("element"));
+  child_iter_ = (child)
+    ? unsmob_iterator (get_iterator (child))
+    : 0;
 }
 
-Music*
-Music_wrapper_iterator::get_music ()
+bool
+Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_->get_music ();
+  return child_iter_ && child_iter_->ok ();
 }
 
-bool
-Music_wrapper_iterator::next ()
+void
+Music_wrapper_iterator::process (Moment m)
 {
-  return child_iter_p_->next ();
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
 
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
+bool
+Music_wrapper_iterator::run_always () const
 {
-  return child_iter_p_->try_music (m);
+  return (child_iter_ &&  child_iter_->run_always ());
 }