X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fevent-chord-iterator.cc;h=0eea36763f3b0fd527dbf29eacd91ed77aa43760;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4f3c081e269bd13b6e6a470cf2886c12f9554769;hpb=f2bd717cbca1a2f3d00b2dc37eca5be39c6e2c33;p=lilypond.git

diff --git a/lily/event-chord-iterator.cc b/lily/event-chord-iterator.cc
index 4f3c081e26..0eea36763f 100644
--- a/lily/event-chord-iterator.cc
+++ b/lily/event-chord-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -46,17 +46,14 @@ Event_chord_iterator::process (Moment m)
       for (SCM s = get_music ()->get_property ("elements");
            scm_is_pair (s); s = scm_cdr (s))
         {
-          Music *mus = unsmob_music (scm_car (s));
-	  while (mus && mus->is_mus_type ("music-wrapper-music"))
-	    mus = unsmob_music (mus->get_property ("element"));
-	  if (mus)
-	    report_event (mus);
+          Music *mus = Music::unsmob (scm_car (s));
+          report_event (mus);
         }
-      for (SCM s = get_music ()->get_property ("events");
+      for (SCM s = get_music ()->get_property ("articulations");
            scm_is_pair (s); s = scm_cdr (s))
         {
-          Stream_event *ev = unsmob_stream_event (scm_car (s));
-          get_outlet ()->event_source ()->broadcast (ev);
+          Music *mus = Music::unsmob (scm_car (s));
+          report_event (mus);
         }
     }
   Simple_music_iterator::process (m);