patch::: 1.3.107.mb1: Re: lily 1.3.107

[lilypond.git] / lily / lyric-combine-music-iterator.cc

diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc
index c422d79e63d3618b63796c0295aca63e17bc35ff..72453e56594672c6fb2eef4496760a45d902c7fe 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -29,17 +29,17 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
       melisma_stop_req = new Melisma_req;
       melisma_start_req = new Melisma_req;      
     }
-  melisma_start_req->span_dir_ = START;
-  melisma_stop_req->span_dir_ = STOP;
+  melisma_start_req->set_span_dir (START);
+  melisma_stop_req->set_span_dir (STOP);
   
   music_iter_p_ =0;
   lyric_iter_p_ =0;
 }
 
 Moment
-Lyric_combine_music_iterator::next_moment () const
+Lyric_combine_music_iterator::pending_moment () const
 {
-  Moment musnext = music_iter_p_->next_moment ();
+  Moment musnext = music_iter_p_->pending_moment ();
   return musnext;
 }
 
@@ -49,12 +49,6 @@ Lyric_combine_music_iterator::ok () const
   return music_iter_p_->ok ();
 }
 
-void
-Lyric_combine_music_iterator::do_print () const
-{
-  music_iter_p_->print ();
-  lyric_iter_p_->print ();
-}
 
 void
 Lyric_combine_music_iterator::construct_children ()
@@ -66,13 +60,13 @@ Lyric_combine_music_iterator::construct_children ()
 }
 
 void
-Lyric_combine_music_iterator::do_process_and_next (Moment m)
+Lyric_combine_music_iterator::process (Moment m)
 {
-  Moment my_next = music_iter_p_->next_moment ();
+  Moment my_next = music_iter_p_->pending_moment ();
   if (my_next > m)
     return;
   
-  music_iter_p_->process_and_next (m);
+  music_iter_p_->process (m);
 
   bool busy = try_music (busy_req);
   if (busy)
@@ -90,13 +84,12 @@ Lyric_combine_music_iterator::do_process_and_next (Moment m)
                lyric_iter_p_->try_music (melisma_stop_req);
 #endif
              
-             Moment m= lyric_iter_p_->next_moment ();
-             lyric_iter_p_->process_and_next (m);
+             Moment m= lyric_iter_p_->pending_moment ();
+             lyric_iter_p_->process (m);
            }
        }
     }
   
-  Music_iterator::do_process_and_next (m);
 }
 
 Lyric_combine_music_iterator::~Lyric_combine_music_iterator ()
@@ -115,3 +108,5 @@ Lyric_combine_music_iterator::try_music_in_children (Music *m) const
     return lyric_iter_p_->try_music (m);
 }
 
+
+IMPLEMENT_CTOR_CALLBACK(Lyric_combine_music_iterator);