X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=8902e3591121c0adfc98a969c7af5da6e6eae4b1;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=b64dfe4a4d903a78b613d9efed9916df1eed5bc8;hpb=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index b64dfe4a4d..8902e35911 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@ class Rest_engraver : public Engraver
 protected:
   void start_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (rest);
+  void listen_rest (Stream_event *);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -45,7 +45,8 @@ public:
 /*
   Should merge with Note_head_engraver
 */
-Rest_engraver::Rest_engraver ()
+Rest_engraver::Rest_engraver (Context *c)
+  : Engraver (c)
 {
   rest_event_ = 0;
   rest_ = 0;
@@ -66,7 +67,7 @@ Rest_engraver::process_music ()
   if (rest_event_ && !rest_)
     {
       rest_ = make_item ("Rest", rest_event_->self_scm ());
-      Pitch *p = Pitch::unsmob (rest_event_->get_property ("pitch"));
+      Pitch *p = unsmob<Pitch> (rest_event_->get_property ("pitch"));
 
       if (p)
         {
@@ -80,13 +81,18 @@ Rest_engraver::process_music ()
     }
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
 void
 Rest_engraver::listen_rest (Stream_event *ev)
 {
   ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
+void
+Rest_engraver::boot ()
+{
+  ADD_LISTENER (Rest_engraver, rest);
+}
+
 ADD_TRANSLATOR (Rest_engraver,
                 /* doc */
                 "Engrave rests.",