``slikken kreng''

[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 e7e7901e871316edd1c0391023be5cdcaed85eaa..75a7d89e6875565e7847acdc4260d7102ab198f9 100644 (file)
--- a/lily/lyric-combine-music-iterator.cc
+++ b/lily/lyric-combine-music-iterator.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -35,31 +35,31 @@ Lyric_combine_music_iterator::Lyric_combine_music_iterator ()
   melisma_start_req->set_span_dir (START);
   melisma_stop_req->set_span_dir (STOP);
   
-  music_iter_p_ =0;
-  lyric_iter_p_ =0;
+  music_iter_ =0;
+  lyric_iter_ =0;
 }
 
 Moment
 Lyric_combine_music_iterator::pending_moment () const
 {
-  Moment musnext = music_iter_p_->pending_moment ();
+  Moment musnext = music_iter_->pending_moment ();
   return musnext;
 }
 
 bool
 Lyric_combine_music_iterator::ok () const
 {
-  return music_iter_p_->ok ();
+  return music_iter_->ok ();
 }
 
 
 void
 Lyric_combine_music_iterator::construct_children ()
 {
-  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (music_l ());
+  Lyric_combine_music const * m = dynamic_cast<Lyric_combine_music const*> (get_music ());
   
-  music_iter_p_ = get_iterator_p (m->music_l ());
-  lyric_iter_p_ = get_iterator_p (m->lyrics_l ());
+  music_iter_ = get_iterator (m->get_music ());
+  lyric_iter_ = get_iterator (m->get_lyrics ());
 }
 
 bool
@@ -72,7 +72,7 @@ Lyric_combine_music_iterator::get_busy_status () const
   if (try_music (busy_req))
     return true;
   
-  Translator_group * tr = music_iter_p_->report_to_l ();
+  Translator_group * tr = music_iter_->report_to ();
 
   SCM grobs = tr->get_property ("busyGrobs");
   Moment now = tr->now_mom();
@@ -96,29 +96,29 @@ Lyric_combine_music_iterator::get_busy_status () const
 void
 Lyric_combine_music_iterator::process (Moment m)
 {
-  Moment my_next = music_iter_p_->pending_moment ();
+  Moment my_next = music_iter_->pending_moment ();
   if (my_next > m)
     return;
   
-  music_iter_p_->process (m);
+  music_iter_->process (m);
 
   if ( get_busy_status ())
     {
       bool melisma_b = try_music (melisma_playing_req);
       if (!melisma_b)
        {
-         if (lyric_iter_p_->ok ())
+         if (lyric_iter_->ok ())
            {
              // FIXME
 #if 0                          // devise a new way for this
              if (melisma_b && !melisma_started_b_)
-               lyric_iter_p_->try_music (melisma_start_req);
+               lyric_iter_->try_music (melisma_start_req);
              else if (melisma_started_b_)
-               lyric_iter_p_->try_music (melisma_stop_req);
+               lyric_iter_->try_music (melisma_stop_req);
 #endif
              
-             Moment m= lyric_iter_p_->pending_moment ();
-             lyric_iter_p_->process (m);
+             Moment m= lyric_iter_->pending_moment ();
+             lyric_iter_->process (m);
            }
        }
     }
@@ -127,25 +127,25 @@ Lyric_combine_music_iterator::process (Moment m)
 
 Lyric_combine_music_iterator::~Lyric_combine_music_iterator ()
 {
-  delete lyric_iter_p_;
-  delete music_iter_p_;
+  delete lyric_iter_;
+  delete music_iter_;
 }
 
 Lyric_combine_music_iterator::Lyric_combine_music_iterator (Lyric_combine_music_iterator const & src)
     : Music_iterator (src)
 {
-  lyric_iter_p_ = src.lyric_iter_p_ ? src.lyric_iter_p_->clone () : 0;
-  music_iter_p_ = src.music_iter_p_ ? src.music_iter_p_->clone () : 0;  
+  lyric_iter_ = src.lyric_iter_ ? src.lyric_iter_->clone () : 0;
+  music_iter_ = src.music_iter_ ? src.music_iter_->clone () : 0;  
 }
 
 Music_iterator*
 Lyric_combine_music_iterator::try_music_in_children (Music *m) const
 {
-  Music_iterator * i =  music_iter_p_->try_music (m);
+  Music_iterator * i =  music_iter_->try_music (m);
   if (i)
     return i;
   else
-    return lyric_iter_p_->try_music (m);
+    return lyric_iter_->try_music (m);
 }