Fix [a8 a32].

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index ca309ecff81db9dbbe1a607d31e17f3662b30297..dcdf880ab5305f2250fad3b58bfdad75a8b20409 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
 #include "killing-cons.tcc"
@@ -35,12 +35,12 @@ Simultaneous_music_iterator::~Simultaneous_music_iterator ()
 }
 
 SCM
-Simultaneous_music_iterator::get_music (Moment m)const
+Simultaneous_music_iterator::get_pending_events (Moment m)const
 {
   SCM s = SCM_EOL;
   for (Cons<Music_iterator> *p = children_p_list_.head_; p; p = p->next_)
     {
-      s = gh_append2 (p->car_->get_music (m), s);
+      s = gh_append2 (p->car_->get_pending_events (m), s);
     }
   return s;
 }
@@ -50,22 +50,22 @@ Simultaneous_music_iterator::construct_children ()
 {
   int j = 0;
 
-  SCM i = music_l ()->get_mus_property ("elements");
+  SCM i = get_music ()->get_mus_property ("elements");
   for (; gh_pair_p (i); i = ly_cdr (i), j++)
     {
       Music *mus = unsmob_music (ly_car (i));
-      Music_iterator * mi = static_get_iterator_p (mus);
+      Music_iterator * mi = get_static_get_iterator (mus);
 
       /* if separate_contexts_b_ is set, create a new context with the
         number number as name */
       
       Translator_group * t = (j && separate_contexts_b_)
-       ? report_to_l ()->find_create_translator_l (report_to_l ()->type_str_,
-                                                   to_str (j))
-       : report_to_l ();
+       ? report_to ()->find_create_translator (report_to ()->type_string_,
+                                                   to_string (j))
+       : report_to ();
 
       if (!t)
-       t = report_to_l ();
+       t = report_to ();
 
       mi->init_translator (mus, t);
       mi->construct_children ();