X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcluster-engraver.cc;h=e8ba45121229d414c83e0449ef07a5d2bd9b322d;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=2e06e1de4b99f61f3ffacb6bbaf6343156cc2609;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 2e06e1de4b..e8ba451212 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -29,15 +29,13 @@
 
 #include "translator.icc"
 
-using std::vector;
-
 class Cluster_spanner_engraver : public Engraver
 {
 
 protected:
   TRANSLATOR_DECLARATIONS (Cluster_spanner_engraver);
-  DECLARE_TRANSLATOR_LISTENER (cluster_note);
-  DECLARE_ACKNOWLEDGER (note_column);
+  void listen_cluster_note (Stream_event *);
+  void acknowledge_note_column (Grob_info);
   void stop_translation_timestep ();
   virtual void process_music ();
   virtual void finalize ();
@@ -50,7 +48,8 @@ private:
   Spanner *finished_spanner_;
 };
 
-Cluster_spanner_engraver::Cluster_spanner_engraver ()
+Cluster_spanner_engraver::Cluster_spanner_engraver (Context *c)
+  : Engraver (c)
 {
   spanner_ = 0;
   finished_spanner_ = 0;
@@ -83,7 +82,6 @@ Cluster_spanner_engraver::typeset_grobs ()
   beacon_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Cluster_spanner_engraver, cluster_note);
 void
 Cluster_spanner_engraver::listen_cluster_note (Stream_event *ev)
 {
@@ -107,8 +105,8 @@ Cluster_spanner_engraver::process_music ()
 
           int p = (pit ? pit->steps () : 0) + c0;
 
-          pmax = std::max (pmax, p);
-          pmin = std::min (pmin, p);
+          pmax = max (pmax, p);
+          pmin = min (pmin, p);
         }
 
       beacon_ = make_item ("ClusterSpannerBeacon", cluster_notes_[0]->self_scm ());
@@ -144,7 +142,13 @@ Cluster_spanner_engraver::acknowledge_note_column (Grob_info info)
     }
 }
 
-ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
+void
+Cluster_spanner_engraver::boot ()
+{
+  ADD_LISTENER (Cluster_spanner_engraver, cluster_note);
+  ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
+}
+
 ADD_TRANSLATOR (Cluster_spanner_engraver,
                 /* doc */
                 "Engrave a cluster using @code{Spanner} notation.",