X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-engraver.cc;h=b59acf73f4d5bda1dd6a0e3b9c715a0695ee6378;hb=18037c60a42e96cf61b13006bb391e3699bdc45e;hp=828c235245343560efbe26ea4cc0a4f648c89f0f;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 828c235245..b59acf73f4 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,28 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "engraver.hh"
 
+#include "dots.hh"
 #include "duration.hh"
 #include "item.hh"
-#include "staff-symbol-referencer.hh"
-#include "dots.hh"
 #include "rhythmic-head.hh"
-#include "music.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Rest_engraver : public Engraver
 {
-  Music *rest_event_;
+  Stream_event *rest_event_;
   Item *dot_;
   Grob *rest_;
 protected:
-  virtual bool try_music (Music *);
   void start_translation_timestep ();
   void process_music ();
-
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -88,19 +89,13 @@ Rest_engraver::process_music ()
     }
 }
 
-bool
-Rest_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Rest_engraver, rest);
+void
+Rest_engraver::listen_rest (Stream_event *ev)
 {
-  if (m->is_mus_type ("rest-event"))
-    {
-      rest_event_ = m;
-      return true;
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Rest_engraver,
 		/* doc */ "",
 		/* create */ "Rest Dots",