X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-engraver.cc;h=630c718ed670bf6960bfda3e72a036e38d877d52;hb=b0f779f7f3445acc75816c9666adbbd427f08170;hp=02bb19f1d1644827ed7e03c593d2a97463d3bcac;hpb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;p=lilypond.git

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index 02bb19f1d1..630c718ed6 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -1,35 +1,39 @@
 /*
   drum-note-engraver.cc
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 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 ();
 };
 
@@ -37,50 +41,25 @@ 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 (m);
-      return true;
-    }
-  else if (m->is_mus_type ("busy-playing-event"))
-    return events_.size ();
-
-  return false;
+  events_.push_back (ev);
 }
 
 void
 Drum_notes_engraver::process_music ()
 {
   SCM tab = 0;
-  for (int i = 0; i < events_.size (); i++)
+  for (vsize i = 0; i < events_.size (); i++)
     {
       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 (d);
-	}
-
       SCM drum_type = ev->get_property ("drum-type");
 
       SCM defn = SCM_EOL;
@@ -102,45 +81,37 @@ Drum_notes_engraver::process_music ()
 	  if (scm_is_string (script))
 	    {
 	      Item *p = make_item ("Script", ev->self_scm ());
-	      bool follow;
-	      make_script_from_event (p, &follow,
-				      context (), script,
+	      make_script_from_event (p, context (), script,
 				      0);
 
-	      if (p->get_property ("follow-into-staff"))
-		p->set_property ("staff-padding", SCM_EOL);
-
 	      p->set_parent (note, Y_AXIS);
 	      Side_position_interface::add_support (p, note);
-	      scripts_.push (p);
+	      scripts_.push_back (p);
 	    }
 	}
 
-      notes_.push (note);
+      notes_.push_back (note);
     }
 }
 
 void
 Drum_notes_engraver::acknowledge_stem (Grob_info inf)
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i];
 
       if (to_dir (e->get_property ("side-relative-direction")))
 	e->set_object ("direction-source", inf.grob ()->self_scm ());
 
-      /*
-	add dep ?
-      */
-      e->add_dependency (inf.grob ());
       Side_position_interface::add_support (e, inf.grob ());
     }
 }
+
 void
 Drum_notes_engraver::acknowledge_note_column (Grob_info inf)
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i];
 
@@ -154,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 */
+		""
+		);