X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-pq-engraver.cc;h=a9fa75eda51d9708252519adc7f7e34b89ad9927;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=82083f464894c734703f40a3c166d26a60cb91e9;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git

diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 82083f4648..a9fa75eda5 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -22,6 +22,8 @@
 #include "grob.hh"
 #include "warn.hh"
 
+#include "translator.icc"
+
 struct Grob_pq_entry
 {
   Grob *grob_;
@@ -40,7 +42,7 @@ public:
   TRANSLATOR_DECLARATIONS (Grob_pq_engraver);
 protected:
   virtual void initialize ();
-  DECLARE_ACKNOWLEDGER (grob);
+  void acknowledge_grob (Grob_info);
   void start_translation_timestep ();
   void stop_translation_timestep ();
   void process_acknowledged ();
@@ -48,7 +50,8 @@ protected:
   vector<Grob_pq_entry> started_now_;
 };
 
-Grob_pq_engraver::Grob_pq_engraver ()
+Grob_pq_engraver::Grob_pq_engraver (Context *c)
+  : Engraver (c)
 {
 }
 
@@ -63,8 +66,8 @@ LY_DEFINE (ly_grob_pq_less_p, "ly:grob-pq<?",
            "Compare two grob priority queue entries."
            "  This is an internal function.")
 {
-  if (Moment::compare (*Moment::unsmob (scm_car (a)),
-                       *Moment::unsmob (scm_car (b))) < 0)
+  if (Moment::compare (*unsmob<Moment> (scm_car (a)),
+                       *unsmob<Moment> (scm_car (b))) < 0)
     return SCM_BOOL_T;
   else
     return SCM_BOOL_F;
@@ -121,7 +124,7 @@ Grob_pq_engraver::stop_translation_timestep ()
   Moment now = now_mom ();
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) == now)
+  while (scm_is_pair (busy) && *unsmob<Moment> (scm_caar (busy)) == now)
     busy = scm_cdr (busy);
 
 }
@@ -133,7 +136,7 @@ Grob_pq_engraver::start_translation_timestep ()
 
   SCM start_busy = get_property ("busyGrobs");
   SCM busy = start_busy;
-  while (scm_is_pair (busy) && *Moment::unsmob (scm_caar (busy)) < now)
+  while (scm_is_pair (busy) && *unsmob<Moment> (scm_caar (busy)) < now)
     {
       /*
         The grob-pq-engraver is not water tight, and stuff like
@@ -142,12 +145,16 @@ Grob_pq_engraver::start_translation_timestep ()
       busy = scm_cdr (busy);
     }
 
-  if (start_busy != busy)
+  if (!scm_is_eq (start_busy, busy))
     context ()->set_property ("busyGrobs", busy);
 }
 
-#include "translator.icc"
-ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
+void
+Grob_pq_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Grob_pq_engraver, grob);
+}
+
 ADD_TRANSLATOR (Grob_pq_engraver,
                 /* doc */
                 "Administrate when certain grobs (e.g., note heads) stop"