X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=c678da031e71905b46056da957bafb3afb97f465;hb=996e6483a80a4748db2fdd7104bf1c605f9260be;hp=01e839b40d8f1c9c3054e710273d67bb02f3c305;hpb=17a0be44b562c72ccfebf2bef4a7a6fcc07bd02f;p=lilypond.git

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 01e839b40d..c678da031e 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -3,38 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "event-chord-iterator.hh"
 
 #include "context.hh"
-#include "warn.hh"
-#include "music.hh"
-#include "input.hh"
-#include "pitch.hh"
+#include "dispatcher.hh"
 #include "duration.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "warn.hh"
 
 Event_chord_iterator::Event_chord_iterator ()
 {
 }
 
-Context *
-Event_chord_iterator::get_bottom_context ()
-{
-  assert (get_outlet ());
-  if (get_outlet ()->is_bottom_context ())
-    return get_outlet ();
-
-  set_context (get_outlet ()->get_default_interpreter ());
-  return get_outlet ();
-}
-
 void
 Event_chord_iterator::construct_children ()
 {
   Simple_music_iterator::construct_children ();
-  get_bottom_context ();
+  descend_to_bottom_context ();
 }
 
 void
@@ -46,10 +36,13 @@ Event_chord_iterator::process (Moment m)
 	   scm_is_pair (s); s = scm_cdr (s))
 	{
 	  Music *mus = unsmob_music (scm_car (s));
-
-	  bool gotcha = try_music (mus);
-	  if (!gotcha)
-	    mus->origin ()->warning (_f ("junking event: `%s'", mus->name ()));
+	  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);