]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/custos-engraver.cc
Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
[lilypond.git] / lily / custos-engraver.cc
index 3b3f7610e0db9efd36c217fd8c7e851d1e5f74db..94bc4910ce24336c5260a91afea5a4edf57d8e3c 100644 (file)
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Juergen Reuter <reuter@ipd.uka.de>,
+  (c) 2000--2007 Juergen Reuter <reuter@ipd.uka.de>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
 #include "item.hh"
 #include "note-head.hh"
+#include "pitch.hh"
 #include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "pitch.hh"
 
 #include "translator.icc"
 
@@ -73,8 +74,8 @@ Custos_engraver::acknowledge_bar (Grob_info info)
 void
 Custos_engraver::acknowledge_note_head (Grob_info info)
 {
-  Music *m = info.music_cause ();
-  if (m && m->is_mus_type ("note-event"))
+  Stream_event *ev = info.event_cause ();
+  if (ev && ev->in_event_class ("note-event"))
     {
 
       /*
@@ -85,7 +86,7 @@ Custos_engraver::acknowledge_note_head (Grob_info info)
        don't look at the staff-position, since we can't be sure
        whether Clef_engraver already applied a vertical shift.
       */
-      pitches_.push_back (*unsmob_pitch (m->get_property ("pitch")));
+      pitches_.push_back (*unsmob_pitch (ev->get_property ("pitch")));
     }
 }
 
@@ -138,6 +139,5 @@ ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 ADD_TRANSLATOR (Custos_engraver,
                /* doc */ "",
                /* create */ "Custos",
-               /* accept */ "",
                /* read */ "",
                /* write */ "");