X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=847c552566827ff22968e695b385cdce08cee1f6;hb=bb931bde01b84a88d2789a639df4b5be134fa17f;hp=56347d07a45dcd412652d6c79f51edc44696ec98;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 56347d07a4..847c552566 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Juergen Reuter <reuter@ipd.uka.de>,
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Juergen Reuter <reuter@ipd.uka.de>,
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 #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"
 
@@ -37,8 +38,8 @@ public:
 private:
   Item *create_custos ();
   bool custos_permitted_;
-  Link_array<Grob> custodes_;
-  Array<Pitch> pitches_;
+  vector<Grob*> custodes_;
+  vector<Pitch> pitches_;
 };
 
 Custos_engraver::Custos_engraver ()
@@ -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 (*unsmob_pitch (m->get_property ("pitch")));
+      pitches_.push_back (*unsmob_pitch (ev->get_property ("pitch")));
     }
 }
 
@@ -97,7 +98,7 @@ Custos_engraver::process_acknowledged ()
 
   if (custos_permitted_)
     {
-      for (int i = pitches_.size (); i--;)
+      for (vsize i = pitches_.size (); i--;)
 	{
 	  Item *c = create_custos ();
 
@@ -119,7 +120,7 @@ Custos_engraver::create_custos ()
 {
   Item *custos = make_item ("Custos", SCM_EOL);
 
-  custodes_.push (custos);
+  custodes_.push_back (custos);
 
   return custos;
 }
@@ -127,7 +128,7 @@ Custos_engraver::create_custos ()
 void
 Custos_engraver::finalize ()
 {
-  for (int i = custodes_.size (); i--;)
+  for (vsize i = custodes_.size (); i--;)
     custodes_[i]->suicide ();
   custodes_.clear ();
 }
@@ -138,6 +139,5 @@ ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 ADD_TRANSLATOR (Custos_engraver,
 		/* doc */ "",
 		/* create */ "Custos",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");