Run `make grand-replace'.

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

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 074e2142f09f4e908c7de145f2a1bf827bf9ebcc..d6c7a26b9cf606b4abd9bc45125569f07d97c793 100644 (file)
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -3,57 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "event-chord-iterator.hh"
+
 #include "context.hh"
+#include "dispatcher.hh"
+#include "duration.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
 #include "warn.hh"
-#include "event-chord-iterator.hh"
-#include "music-list.hh"
-#include "event.hh"
 
 Event_chord_iterator::Event_chord_iterator ()
 {
 }
 
-Context *
-Event_chord_iterator::get_req_translator ()
-{
-  assert (get_outlet ());
-  if (get_outlet ()->is_bottom_context ())
-    return get_outlet ();
-
-  set_translator (get_outlet ()->get_default_interpreter ());
-  return get_outlet ();
-}
-
 void
 Event_chord_iterator::construct_children ()
 {
   Simple_music_iterator::construct_children ();
-  get_req_translator ();
+  descend_to_bottom_context ();
 }
 
-Event_chord*
-Event_chord_iterator::get_elt () const
-{
-  return (Event_chord*) get_music ();
-}
-
-
 void
 Event_chord_iterator::process (Moment m)
 {
   if (last_processed_mom_ < Moment (0))
     {
-      for (SCM s = dynamic_cast<Music_sequence *> (get_music ())->music_list ();
-          is_pair (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));
-
-         bool gotcha = try_music (mus);
-         if (!gotcha)
-           mus->origin ()->warning (_f ("Junking event: `%s'", mus->name ()));
+         Music *mus = unsmob_music (scm_car (s));
+         report_event (mus);
+       }
+      for (SCM s = get_music ()->get_property ("events");
+          scm_is_pair (s); s = scm_cdr (s))
+       {
+         Stream_event *ev = unsmob_stream_event (scm_car (s));
+         get_outlet ()->event_source ()->broadcast (ev);
        }
     }
   Simple_music_iterator::process (m);