* lily/note-column.cc (dir): idem.

[lilypond.git] / lily / event-chord-iterator.cc

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index d45168d5733d89953384c1a24a31e7d4b96d748c..01e839b40d8f1c9c3054e710273d67bb02f3c305 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -3,32 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "translator-group.hh"
-#include "warn.hh"
 #include "event-chord-iterator.hh"
-#include "music-list.hh"
-#include "event.hh"
 
-Event_chord_iterator::Event_chord_iterator ()
-{
-}
+#include "context.hh"
+#include "warn.hh"
+#include "music.hh"
+#include "input.hh"
+#include "pitch.hh"
+#include "duration.hh"
 
-Event_chord_iterator::Event_chord_iterator (Event_chord_iterator const &src)
-  : Simple_music_iterator (src)
+Event_chord_iterator::Event_chord_iterator ()
 {
 }
 
-Translator_group*
-Event_chord_iterator::get_req_translator ()
+Context *
+Event_chord_iterator::get_bottom_context ()
 {
   assert (get_outlet ());
   if (get_outlet ()->is_bottom_context ())
     return get_outlet ();
 
-  set_translator (get_outlet ()->get_default_interpreter ());
+  set_context (get_outlet ()->get_default_interpreter ());
   return get_outlet ();
 }
 
@@ -36,31 +34,25 @@ void
 Event_chord_iterator::construct_children ()
 {
   Simple_music_iterator::construct_children ();
-  get_req_translator ();
+  get_bottom_context ();
 }
 
-Event_chord*
-Event_chord_iterator::get_elt () const
-{
-  return (Event_chord*) get_music ();
-}
-
-
 void
-Event_chord_iterator::process (Moment )
+Event_chord_iterator::process (Moment m)
 {
   if (last_processed_mom_ < Moment (0))
     {
-      for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list ();
-          gh_pair_p (s);  s = ly_cdr (s))
+      for (SCM s = get_music ()->get_property ("elements");
+          scm_is_pair (s); s = scm_cdr (s))
        {
-         Music *mus = unsmob_music (ly_car (s));
+         Music *mus = unsmob_music (scm_car (s));
 
          bool gotcha = try_music (mus);
          if (!gotcha)
-           mus->origin ()->warning (_f ("Junking event: `%s'", mus->name()));
+           mus->origin ()->warning (_f ("junking event: `%s'", mus->name ()));
        }
     }
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Event_chord_iterator);