X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=1309f448d3c18cc7e806f0c6b4d3df3e709021c4;hb=12f05ebf99e912dd94359f86d503ce8cbf1f9891;hp=9293fc72bc553c4c09839cf3e25c757c0d7dd0da;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 9293fc72bc..1309f448d3 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,36 +1,39 @@
 /*
   drum-note-engraver.cc
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cctype>
 using namespace std;
 
-#include "rhythmic-head.hh"
+#include "item.hh"
+#include "duration.hh"
 #include "engraver.hh"
-#include "warn.hh"
+#include "note-column.hh"
+#include "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "script-interface.hh"
 #include "stem.hh"
-#include "note-column.hh"
-#include "duration.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 class Drum_notes_engraver : public Engraver
 {
-  Link_array__Item_ notes_;
-  Link_array__Item_ dots_;
-  Link_array__Item_ scripts_;
-  Link_array__Music_ events_;
+  vector<Item*> notes_;
+  vector<Item*> scripts_;
+  vector<Stream_event*> events_;
 
 public:
   TRANSLATOR_DECLARATIONS (Drum_notes_engraver);
 
 protected:
-  virtual bool try_music (Music *ev);
   void process_music ();
   DECLARE_ACKNOWLEDGER (stem);
   DECLARE_ACKNOWLEDGER (note_column);
+  DECLARE_TRANSLATOR_LISTENER (note);
   void stop_translation_timestep ();
 };
 
@@ -38,18 +41,11 @@ Drum_notes_engraver::Drum_notes_engraver ()
 {
 }
 
-bool
-Drum_notes_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Drum_notes_engraver, note);
+void
+Drum_notes_engraver::listen_note (Stream_event *ev)
 {
-  if (m->is_mus_type ("note-event"))
-    {
-      events_.push_back (m);
-      return true;
-    }
-  else if (m->is_mus_type ("busy-playing-event"))
-    return events_.size ();
-
-  return false;
+  events_.push_back (ev);
 }
 
 void
@@ -61,27 +57,9 @@ Drum_notes_engraver::process_music ()
       if (!tab)
 	tab = get_property ("drumStyleTable");
 
-      Music *ev = events_[i];
+      Stream_event *ev = events_[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", ev->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);
-	}
-
       SCM drum_type = ev->get_property ("drum-type");
 
       SCM defn = SCM_EOL;
@@ -147,20 +125,27 @@ void
 Drum_notes_engraver::stop_translation_timestep ()
 {
   notes_.clear ();
-  dots_.clear ();
   scripts_.clear ();
 
   events_.clear ();
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Drum_notes_engraver, stem);
 ADD_ACKNOWLEDGER (Drum_notes_engraver, note_column);
+
+
 ADD_TRANSLATOR (Drum_notes_engraver,
-		/* doc */ "Generate noteheads.",
-		/* create */ "NoteHead Dots Script",
-		/* accept */ "note-event busy-playing-event",
-		/* read */ "drumStyleTable",
-		/* write */ "");
+		/* doc */
+		"Generate drum note heads.",
+
+		/* create */
+		"NoteHead "
+		"Script ",
+
+		/* read */
+		"drumStyleTable ",
+
+		/* write */
+		""
+		);