X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos-engraver.cc;h=7d15aeaba85a77e91f5b772eeace86aafbd5fc1d;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=6b915f5cb45114851b4a513730048dc6bfe126db;hpb=952705bbbb000581a13836e6a733df04511e93c5;p=lilypond.git

diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 6b915f5cb4..7d15aeaba8 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Juergen Reuter <reuter@ipd.uka.de>,
+  Copyright (C) 2000--2015 Juergen Reuter <reuter@ipd.uka.de>,
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -39,8 +39,8 @@ class Custos_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Custos_engraver);
   void start_translation_timestep ();
-  DECLARE_ACKNOWLEDGER (bar);
-  DECLARE_ACKNOWLEDGER (note_head);
+  void acknowledge_bar (Grob_info);
+  void acknowledge_note_head (Grob_info);
   void process_acknowledged ();
   void stop_translation_timestep ();
   virtual void finalize ();
@@ -52,7 +52,8 @@ private:
   vector<Pitch> pitches_;
 };
 
-Custos_engraver::Custos_engraver ()
+Custos_engraver::Custos_engraver (Context *c)
+  : Engraver (c)
 {
   custos_permitted_ = false;
 }
@@ -95,7 +96,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 (ev->get_property ("pitch")));
+      pitches_.push_back (*unsmob<Pitch> (ev->get_property ("pitch")));
     }
 }
 
@@ -142,8 +143,13 @@ Custos_engraver::finalize ()
   custodes_.clear ();
 }
 
-ADD_ACKNOWLEDGER (Custos_engraver, bar);
-ADD_ACKNOWLEDGER (Custos_engraver, note_head);
+
+void
+Custos_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Custos_engraver, bar);
+  ADD_ACKNOWLEDGER (Custos_engraver, note_head);
+}
 
 ADD_TRANSLATOR (Custos_engraver,
                 /* doc */