X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic-wrapper-iterator.cc;h=b6d0d616564c2e655464da371d642e94f5dfcf88;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=834494c88d1db95fc19bf8fc4a3cea04aa298cc9;hpb=287611887cd612ac84dbf10c5fe4e1a44cc56596;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 834494c88d..b6d0d61656 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,65 +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--2007 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;
 }
 
-Music_wrapper_iterator::Music_wrapper_iterator (Music_wrapper_iterator const &src)
-  : Music_iterator (src)
+void
+Music_wrapper_iterator::do_quit ()
 {
-  child_iter_p_ = src.child_iter_p_->clone ();
+  if (child_iter_)
+    child_iter_->quit ();
 }
 
-Music_wrapper_iterator::~Music_wrapper_iterator ()
+void
+Music_wrapper_iterator::derived_mark () const
 {
-  delete child_iter_p_;
+  if (child_iter_)
+    scm_gc_mark (child_iter_->self_scm ());
 }
 
+void
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
+{
+  if (child_iter_)
+    child_iter_->substitute_outlet (f, t);
+}
 
 void
 Music_wrapper_iterator::construct_children ()
 {
-  child_iter_p_ =
-    get_iterator_p (dynamic_cast<Music_wrapper const*> (music_l_)->element ());
+  Music *my_music = get_music ();
+  Music *child = unsmob_music (my_music->get_property ("element"));
+  child_iter_ = (child)
+    ? unsmob_iterator (get_iterator (child))
+    : 0;
 }
 
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
 
 void
 Music_wrapper_iterator::process (Moment m)
 {
-  child_iter_p_->process (m);
-}
-
-SCM
-Music_wrapper_iterator::get_music (Moment m)const
-{
-  return child_iter_p_->get_music (m);
+  if (child_iter_)
+    child_iter_->process (m);
 }
 
 Moment
 Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->pending_moment ();
+  if (child_iter_)
+    return child_iter_->pending_moment ();
+  else
+    return Music_iterator::pending_moment ();
 }
 
-Music_iterator*
-Music_wrapper_iterator::try_music_in_children (Music *m) const
+IMPLEMENT_CTOR_CALLBACK (Music_wrapper_iterator);
+
+bool
+Music_wrapper_iterator::run_always () const
 {
-  return child_iter_p_->try_music (m);
+  return (child_iter_ &&  child_iter_->run_always ());
 }