Bring dev/johngourlay/issue-4751 up to date with respect to staging.

[lilypond.git] / lily / output-property-engraver.cc

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 2150a208823588e70f53045ebba8e4fd1b648275..7a0fa2d3c3389484cb94f03c6f798f0a1e6b866c 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -24,7 +24,6 @@
 
 #include "translator.icc"
 
-using std::vector;
 
 class Output_property_engraver : public Engraver
 {
@@ -32,13 +31,12 @@ class Output_property_engraver : public Engraver
 protected:
   vector<Stream_event*> props_;
   
-  DECLARE_ACKNOWLEDGER (grob);
-  DECLARE_TRANSLATOR_LISTENER (apply_output);
+  void acknowledge_grob (Grob_info);
+  void listen_apply_output (Stream_event *);
 
   void stop_translation_timestep ();
 };
 
-IMPLEMENT_TRANSLATOR_LISTENER (Output_property_engraver, apply_output);
 void
 Output_property_engraver::listen_apply_output (Stream_event *ev)
 {
@@ -79,7 +77,13 @@ Output_property_engraver::Output_property_engraver ()
 {
 }
 
-ADD_ACKNOWLEDGER (Output_property_engraver, grob);
+void
+Output_property_engraver::boot ()
+{
+  ADD_LISTENER (Output_property_engraver, apply_output);
+  ADD_ACKNOWLEDGER (Output_property_engraver, grob);
+}
+
 ADD_TRANSLATOR (Output_property_engraver,
                /* doc */
                "Apply a procedure to any grob acknowledged.",