release: 1.3.73

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

diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc
index 58e04051752d014ef79de72abae9c580a06c91d6..d99381cf5415a8645039c6251cf44388c58e6575 100644 (file)
--- a/lily/sequential-music-iterator.cc
+++ b/lily/sequential-music-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "grace-iterator.hh"
 #include "translator-group.hh"
@@ -30,9 +30,9 @@ Sequential_music_iterator::Sequential_music_iterator ()
 void
 Sequential_music_iterator::construct_children()
 {
-  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_p_list_p_->head_;
+  cursor_ = dynamic_cast<Music_sequence const*> (music_l_)->music_list ();
   
-  while (cursor_)
+  while (gh_pair_p (cursor_ ))
     {
       start_next_element();
       if (!iter_p_->ok()) 
@@ -52,16 +52,16 @@ Sequential_music_iterator::leave_element()
 {
   delete iter_p_;
   iter_p_ =0;
-  Moment elt_time = cursor_->car_->length_mom ();
+  Moment elt_time = unsmob_music (gh_car (cursor_))->length_mom ();
   here_mom_ += elt_time;
-  cursor_ =cursor_->next_;
+  cursor_ =gh_cdr (cursor_);
 }
 
 void
 Sequential_music_iterator::start_next_element()
 {
   assert (!iter_p_);
-  iter_p_ = get_iterator_p (cursor_->car_);
+  iter_p_ = get_iterator_p (unsmob_music (gh_car (cursor_)));
 }
 
 void
@@ -80,15 +80,12 @@ Sequential_music_iterator::~Sequential_music_iterator()
   if (iter_p_)
     {
       if (iter_p_->ok ())
-       music_l_->warning (_ ("Must stop before this music ends"));
+       music_l_->origin ()->warning (_ ("Must stop before this music ends"));
       delete iter_p_;
       iter_p_ = 0;
     }
 }
 
-
-
-
 void
 Sequential_music_iterator::do_process_and_next (Moment until)
 {
@@ -112,7 +109,7 @@ Sequential_music_iterator::do_process_and_next (Moment until)
          set_sequential_music_translator();
          leave_element();
          
-         if (cursor_)
+         if (gh_pair_p (cursor_))
            start_next_element();
          else 
            goto loopexit;
@@ -138,7 +135,7 @@ Sequential_music_iterator::ok() const
 }
 
 Music_iterator*
-Sequential_music_iterator::try_music_in_children (Music const *m) const
+Sequential_music_iterator::try_music_in_children (Music *m) const
 { 
   return iter_p_ ? iter_p_->try_music (m) : 0;
 }