X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-beam-engraver.cc;h=2c61f00959b3283568bf6550508949f688555f60;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=9e4a1ac28c645ae9914d8a13264b4f941c8ec9c3;hpb=7c36dbb1834c7c68e4b94777241de3ea02971aca;p=lilypond.git

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 9e4a1ac28c..2c61f00959 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -45,7 +45,6 @@ protected:
   virtual void finalize ();
   virtual void derived_mark () const;
 
-public:
   void acknowledge_rest (Grob_info);
   void acknowledge_beam (Grob_info);
   void acknowledge_bar_line (Grob_info);
@@ -148,7 +147,8 @@ Auto_beam_engraver::process_music ()
     }
 }
 
-Auto_beam_engraver::Auto_beam_engraver ()
+Auto_beam_engraver::Auto_beam_engraver (Context *c)
+  : Engraver (c)
 {
   forbid_ = 0;
   process_acknowledged_count_ = 0;
@@ -580,8 +580,7 @@ ADD_TRANSLATOR (Auto_beam_engraver,
 class Grace_auto_beam_engraver : public Auto_beam_engraver
 {
   TRANSLATOR_DECLARATIONS (Grace_auto_beam_engraver);
-  TRANSLATOR_INHERIT (Auto_beam_engraver)
-  void listen_beam_forbid (Stream_event *);
+  TRANSLATOR_INHERIT (Auto_beam_engraver);
 
 private:
   Moment last_grace_start_; // Full starting time of last grace group
@@ -591,19 +590,14 @@ private:
   virtual bool test_moment (Direction, Moment, Moment);
 };
 
-Grace_auto_beam_engraver::Grace_auto_beam_engraver ()
+Grace_auto_beam_engraver::Grace_auto_beam_engraver (Context *c)
+  : Auto_beam_engraver (c)
 {
   last_grace_start_.main_part_.set_infinite (-1);
   // grace_part_ is zero -> test_moment is false, last_grace_position_
   // not considered.
 }
 
-void
-Grace_auto_beam_engraver::listen_beam_forbid (Stream_event *ev)
-{
-  Auto_beam_engraver::listen_beam_forbid (ev);
-}
-
 bool
 Grace_auto_beam_engraver::is_same_grace_state (Moment, Moment)
 {
@@ -647,11 +641,11 @@ void
 Grace_auto_beam_engraver::boot ()
 {
   ADD_LISTENER (Grace_auto_beam_engraver, beam_forbid);
-  ADD_ACKNOWLEDGER (Auto_beam_engraver, stem);
-  ADD_ACKNOWLEDGER (Auto_beam_engraver, bar_line);
-  ADD_ACKNOWLEDGER (Auto_beam_engraver, beam);
-  ADD_ACKNOWLEDGER (Auto_beam_engraver, breathing_sign);
-  ADD_ACKNOWLEDGER (Auto_beam_engraver, rest);
+  ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, stem);
+  ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, bar_line);
+  ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, beam);
+  ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, breathing_sign);
+  ADD_ACKNOWLEDGER (Grace_auto_beam_engraver, rest);
 }
 
 ADD_TRANSLATOR (Grace_auto_beam_engraver,