(class Music_iterator): change

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

diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc
index d2c99bb2802c2fd2929387dc4add256e4661115b..f496b6378484f975c025f77d0df91051991a737c 100644 (file)
--- a/lily/simultaneous-music-iterator.cc
+++ b/lily/simultaneous-music-iterator.cc
@@ -7,7 +7,7 @@
 */
 
 #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;
 }