X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=847c552566827ff22968e695b385cdce08cee1f6;hb=ae99aa08986aad83845b2dee6fa6cddeb2526433;hp=2bf02392ffc954d92e86e307bf75e31d6d4f5d77;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 2bf02392ff..847c552566 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -3,21 +3,21 @@
 
   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"
 
-
 /*
  * This class implements an engraver for custos symbols.
  *
@@ -28,18 +28,18 @@ class Custos_engraver : public Engraver
 {
 public:
   TRANSLATOR_DECLARATIONS (Custos_engraver);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  DECLARE_ACKNOWLEDGER(bar);
-  DECLARE_ACKNOWLEDGER(note_head);
-  PRECOMPUTED_VIRTUAL void process_acknowledged ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void start_translation_timestep ();
+  DECLARE_ACKNOWLEDGER (bar);
+  DECLARE_ACKNOWLEDGER (note_head);
+  void process_acknowledged ();
+  void stop_translation_timestep ();
   virtual void finalize ();
 
 private:
   Item *create_custos ();
   bool custos_permitted_;
-  Link_array<Grob> custodes_;
-  Array<Pitch> pitches_;
+  vector<Grob*> custodes_;
+  vector<Pitch> pitches_;
 };
 
 Custos_engraver::Custos_engraver ()
@@ -67,14 +67,15 @@ Custos_engraver::start_translation_timestep ()
 void
 Custos_engraver::acknowledge_bar (Grob_info info)
 {
+  (void) info;
   custos_permitted_ = true;
 }
 
 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 ();
 
@@ -107,7 +108,7 @@ Custos_engraver::process_acknowledged ()
 	    p += scm_to_int (c0);
 
 	  c->set_property ("staff-position",
-			   scm_int2num (p));
+			   scm_from_int (p));
 	}
 
       pitches_.clear ();
@@ -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,21 +128,16 @@ Custos_engraver::create_custos ()
 void
 Custos_engraver::finalize ()
 {
-  for (int i = custodes_.size (); i--;)
-    {
-      custodes_[i]->suicide ();
-    }
+  for (vsize i = custodes_.size (); i--;)
+    custodes_[i]->suicide ();
   custodes_.clear ();
 }
 
-
-ADD_ACKNOWLEDGER(Custos_engraver,bar);
-ADD_ACKNOWLEDGER(Custos_engraver,note_head);
+ADD_ACKNOWLEDGER (Custos_engraver, bar);
+ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 
 ADD_TRANSLATOR (Custos_engraver,
-		/* descr */ "",
-		/* creats*/ "Custos",
-		/* accepts */ "",
-		/* acks  */ "",
-		/* reads */ "",
+		/* doc */ "",
+		/* create */ "Custos",
+		/* read */ "",
 		/* write */ "");