Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / drum-note-performer.cc

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index a4e0ff2f7f526841fa04b1e212153e33b68c590e..a29b7a1dee7986a512317066d44f61c7e603fd92 100644 (file)
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -10,10 +10,9 @@
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
-#include "pitch.hh"
-#include "stream-event.hh"
-#include "translator.icc"
 #include "warn.hh"
+#include "pitch.hh"
+#include "music.hh"
 
 class Drum_note_performer : public Performer
 {
@@ -21,11 +20,12 @@ public:
   TRANSLATOR_DECLARATIONS (Drum_note_performer);
 
 protected:
+  virtual bool try_music (Music *ev);
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (note);
+
 private:
-  vector<Stream_event*> note_evs_;
+  vector<Music*> note_evs_;
   vector<Audio_note*> notes_;
 };
 
@@ -40,7 +40,7 @@ Drum_note_performer::process_music ()
 
   while (note_evs_.size ())
     {
-      Stream_event *n = note_evs_.back ();
+      Music *n = note_evs_.back ();
       note_evs_.pop_back ();
       SCM sym = n->get_property ("drum-type");
       SCM defn = SCM_EOL;
@@ -51,22 +51,7 @@ Drum_note_performer::process_music ()
 
       if (Pitch *pit = unsmob_pitch (defn))
        {
-          SCM articulations = n->get_property ("articulations");
-          Stream_event *tie_event = 0;
-          for (SCM s = articulations;
-               !tie_event && scm_is_pair (s);
-               s = scm_cdr (s))
-            {
-              Stream_event *ev = unsmob_stream_event (scm_car (s));
-              if (!ev)
-                continue;
-         
-              if (ev->in_event_class ("tie-event"))
-                tie_event = ev;
-            }
-
-         Audio_note *p = new Audio_note (*pit, get_event_length (n), 
-                                          tie_event, 0);
+         Audio_note *p = new Audio_note (*pit, n->get_length (), 0);
          Audio_element_info info (p, n);
          announce_element (info);
          notes_.push_back (p);
@@ -79,17 +64,31 @@ Drum_note_performer::process_music ()
 void
 Drum_note_performer::stop_translation_timestep ()
 {
+  // why don't grace notes show up here?
+  // --> grace notes effectively do not get delayed
+  Moment now = now_mom ();
+  for (vsize i = 0; i < notes_.size (); i++)
+    play_element (notes_[i]);
   notes_.clear ();
   note_evs_.clear ();
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Drum_note_performer, note);
-void
-Drum_note_performer::listen_note (Stream_event *ev)
+bool
+Drum_note_performer::try_music (Music *ev)
 {
-  note_evs_.push_back (ev);
+  if (ev->is_mus_type ("note-event"))
+    {
+      note_evs_.push_back (ev);
+      return true;
+    }
+  else if (ev->is_mus_type ("busy-playing-event"))
+    return note_evs_.size ();
+
+  return false;
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Drum_note_performer,
                "Play drum notes.", "",
-               "note-event", "", "");
+               "note-event busy-playing-event", "", "");