* scm/define-grobs.scm (all-grob-descriptions): use callback to

[lilypond.git] / lily / note-heads-engraver.cc

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index d650b675e76b645f6a23fb098c179e4a8071a87c..cfd684779948acdb97a151424b88d58e6d78bd5c 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -9,26 +9,30 @@
 #include <cctype>
 using namespace std;
 
-#include "rhythmic-head.hh"
-#include "output-def.hh"
 #include "dots.hh"
 #include "dot-column.hh"
-#include "staff-symbol-referencer.hh"
+#include "duration.hh"
 #include "item.hh"
+#include "output-def.hh"
+#include "pitch.hh"
+#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "duration.hh"
+
+#include "translator.icc"
 
 class Note_heads_engraver : public Engraver
 {
   vector<Item*> notes_;
   vector<Item*> dots_;
-  vector<Music*> note_evs_;
+  vector<Stream_event*> note_evs_;
 
 public:
   TRANSLATOR_DECLARATIONS (Note_heads_engraver);
 
 protected:
-  virtual bool try_music (Music *ev);
+  DECLARE_TRANSLATOR_LISTENER (note);
   void process_music ();
   void stop_translation_timestep ();
 };
@@ -37,16 +41,11 @@ Note_heads_engraver::Note_heads_engraver ()
 {
 }
 
-bool
-Note_heads_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Note_heads_engraver, note);
+void
+Note_heads_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      note_evs_.push_back (m);
-      return true;
-    }
-
-  return false;
+  note_evs_.push_back (ev);
 }
 
 void
@@ -54,26 +53,9 @@ Note_heads_engraver::process_music ()
 {
   for (vsize i = 0; i < note_evs_.size (); i++)
     {
-      Music *ev = note_evs_[i];
+      Stream_event *ev = note_evs_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());
 
-      Duration dur = *unsmob_duration (ev->get_property ("duration"));
-
-      note->set_property ("duration-log", scm_from_int (dur.duration_log ()));
-      if (dur.dot_count ())
-       {
-         Item *d = make_item ("Dots", note->self_scm ());
-         Rhythmic_head::set_dots (note, d);
-
-         if (dur.dot_count ()
-             != robust_scm2int (d->get_property ("dot-count"), 0))
-           d->set_property ("dot-count", scm_from_int (dur.dot_count ()));
-
-         d->set_parent (note, Y_AXIS);
-
-         dots_.push_back (d);
-       }
-
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
 
 #if 0 /* TODO: should have a mechanism to switch off these warnings. */
@@ -122,8 +104,6 @@ Note_heads_engraver::stop_translation_timestep ()
   note_evs_.clear ();
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Note_heads_engraver,
                /* doc */ "Generate noteheads.",
                /* create */