* lily/translator.cc, lily/context.cc:, lily/translator-group.cc:

[lilypond.git] / lily / rest-engraver.cc

diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 2a90b776ce7e5b8598493ec0979d1af8bb48c897..95a8d10126e2c5cd2296e5d774d59363b7337f0c 100644 (file)
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -3,29 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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 "pitch.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 *);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-  PRECOMPUTED_VIRTUAL void process_music ();
-
+  void start_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (rest);
 public:
   TRANSLATOR_DECLARATIONS (Rest_engraver);
 };
@@ -48,7 +49,6 @@ Rest_engraver::start_translation_timestep ()
   dot_ = 0;
 }
 
-
 void
 Rest_engraver::process_music ()
 {
@@ -59,7 +59,7 @@ Rest_engraver::process_music ()
       int durlog = unsmob_duration (rest_event_->get_property ("duration"))->duration_log ();
 
       rest_->set_property ("duration-log",
-                          scm_int2num (durlog));
+                          scm_from_int (durlog));
 
       int dots = unsmob_duration (rest_event_->get_property ("duration"))->dot_count ();
 
@@ -69,7 +69,7 @@ Rest_engraver::process_music ()
 
          Rhythmic_head::set_dots (rest_, dot_);
          dot_->set_parent (rest_, Y_AXIS);
-         dot_->set_property ("dot-count", scm_int2num (dots));
+         dot_->set_property ("dot-count", scm_from_int (dots));
        }
 
       Pitch *p = unsmob_pitch (rest_event_->get_property ("pitch"));
@@ -85,28 +85,21 @@ Rest_engraver::process_music ()
          if (scm_is_number (c0))
            pos += scm_to_int (c0);
 
-         rest_->set_property ("staff-position", scm_int2num (pos));
+         rest_->set_property ("staff-position", scm_from_int (pos));
        }
     }
 }
 
-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,
-               /* descr */ "",
-               /* creats*/ "Rest Dots",
-               /* accepts */ "rest-event",
-               /* acks  */ "",
-               /* reads */ "middleCPosition",
+               /* doc */ "",
+               /* create */ "Rest Dots",
+               /* accept */ "rest-event",
+               /* read */ "middleCPosition",
                /* write */ "");