(process_acknowledged_grobs): new

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 7d632c7f1341cb57195d8b831ef597e4bfa26e05..9964be5b7b94f2e0efae799dafb25bc3339c1789 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,18 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 /*
   UGH. too many includes.
  */
+#include <stdio.h>
+
 #include "warn.hh"
 #include "music-iterator.hh"
 #include "translator-group.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
+
 #include "ly-smobs.icc"
 
 Music_iterator::Music_iterator ()
@@ -106,14 +109,14 @@ Music_iterator::get_static_get_iterator (Music *m)
 
   p->music_ = m;
   assert (m);
-  p->music_length_ = m->length_mom ();
+  p->music_length_ = m->get_length ();
   p->start_mom_ = m->start_mom ();
   return iter;
 }
 
 
 Moment
-Music_iterator::music_length_mom () const
+Music_iterator::music_get_length () const
 {
   return music_length_;
 }
@@ -177,7 +180,7 @@ Music_iterator::get_music () const
 
 /****************************************************************/
 
-IMPLEMENT_TYPE_P (Music_iterator, "ly-iterator?");
+IMPLEMENT_TYPE_P (Music_iterator, "ly:iterator?");
 IMPLEMENT_SMOBS(Music_iterator);
 IMPLEMENT_DEFAULT_EQUAL_P(Music_iterator);
 
@@ -201,9 +204,13 @@ Music_iterator::mark_smob (SCM smob)
 }
 
 int
-Music_iterator::print_smob (SCM , SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm , SCM port, scm_print_state*)
 {
-  scm_puts ("#<Music iterator>", port);
+  char s[1000];
+
+  Music_iterator *iter = unsmob_iterator (sm);
+  sprintf (s, "#<%s>", classname (iter));
+  scm_puts (s, port);
   return 1;
 }