release: 1.3.87

[lilypond.git] / lily / music-wrapper-iterator.cc

diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc
index 46f9b6da26279fbf7d97acbaa400a99f84324789..834494c88d1db95fc19bf8fc4a3cea04aa298cc9 100644 (file)
--- a/lily/music-wrapper-iterator.cc
+++ b/lily/music-wrapper-iterator.cc
@@ -4,7 +4,6 @@
   source file of the GNU LilyPond music typesetter
   
   (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
  */
 
 
@@ -27,11 +26,6 @@ Music_wrapper_iterator::~Music_wrapper_iterator ()
   delete child_iter_p_;
 }
 
-void
-Music_wrapper_iterator::do_print () const
-{
-  child_iter_p_->print ();
-}
 
 void
 Music_wrapper_iterator::construct_children ()
@@ -47,31 +41,23 @@ Music_wrapper_iterator::ok () const
 }
 
 void
-Music_wrapper_iterator::do_process (Moment m)
+Music_wrapper_iterator::process (Moment m)
 {
   child_iter_p_->process (m);
-  Music_iterator::do_process (m);
 }
 
 SCM
-Music_wrapper_iterator::get_music ()
+Music_wrapper_iterator::get_music (Moment m)const
 {
-  return child_iter_p_->get_music ();
-}
-
-bool
-Music_wrapper_iterator::next ()
-{
-  return child_iter_p_->next ();
+  return child_iter_p_->get_music (m);
 }
 
 Moment
-Music_wrapper_iterator::next_moment () const
+Music_wrapper_iterator::pending_moment () const
 {
-  return child_iter_p_->next_moment ();
+  return child_iter_p_->pending_moment ();
 }
 
-
 Music_iterator*
 Music_wrapper_iterator::try_music_in_children (Music *m) const
 {