X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=2b1441a2756d862efde60cff2d5cc02e7c8db328;hb=e63dac8853909a52de02b480bcf3f1718433d09f;hp=29713a52dc1e7ccc2c979b178f219298644812ff;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 29713a52dc..2b1441a275 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -3,27 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "translator-group.hh"
-#include "warn.hh"
 #include "event-chord-iterator.hh"
-#include "music-list.hh"
-#include "event.hh"
+
+#include "context.hh"
+#include "duration.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "pitch.hh"
+#include "warn.hh"
 
 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 ();
 }
 
@@ -31,29 +35,22 @@ 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 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);