X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-wrapper-iterator.cc;h=e89896ce663652bca52800985e9ecdf487eeedc4;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=4aa13bd9a24fad357a3a1d7fa9145d27312063b8;hpb=9b34d4afef6dd3f50c8f9cec1e613eb44f8c7913;p=lilypond.git

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 4aa13bd9a2..e89896ce66 100644
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -1,79 +1,70 @@
-/*   
-  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--2006 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_;
+  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::do_print () const
+Music_wrapper_iterator::derived_substitute (Context *f, Context *t)
 {
-  child_iter_p_->print ();
+  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_ = unsmob_iterator (get_iterator (child));
 }
 
 bool
 Music_wrapper_iterator::ok () const
 {
-  return child_iter_p_ && child_iter_p_->ok ();
+  return child_iter_ && child_iter_->ok ();
 }
 
 void
-Music_wrapper_iterator::do_process_and_next (Moment m)
-{
-  child_iter_p_->process_and_next (m);
-  Music_iterator::do_process_and_next (m);
-}
-
-Music*
-Music_wrapper_iterator::get_music ()
+Music_wrapper_iterator::process (Moment m)
 {
-  return child_iter_p_->get_music ();
-}
-
-bool
-Music_wrapper_iterator::next ()
-{
-  return child_iter_p_->next ();
+  child_iter_->process (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_->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_->run_always ();
 }