X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=ee445f5ad89aac3d14db3c510a1e47e2e8adc206;hb=0ed6c4f5d241424be86f34fda2cc298932cb37b0;hp=d1b38e4b77a9299e8e12a0e20635dab5b2b5bcb8;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index d1b38e4b77..ee445f5ad8 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -3,116 +3,104 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 #include "warn.hh"
 
-class Drum_note_performer : public Performer {
+class Drum_note_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Drum_note_performer);
-  
-protected:
-  virtual bool try_music (Music *ev) ;
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
 
+protected:
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
-  Link_array<Audio_note> delayeds_;
+  vector<Stream_event*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
-void 
-Drum_note_performer::create_audio_elements ()
+Drum_note_performer::Drum_note_performer ()
 {
-  SCM tab = 0;
-  if (!tab) tab = get_property ("drumPitchTable");
-  
+}
+
+void
+Drum_note_performer::process_music ()
+{
+  SCM tab = get_property ("drumPitchTable");
+
   while (note_evs_.size ())
     {
-      Music* n = note_evs_.pop ();
+      Stream_event *n = note_evs_.back ();
+      note_evs_.pop_back ();
       SCM sym = n->get_property ("drum-type");
       SCM defn = SCM_EOL;
 
       if (scm_is_symbol (sym)
-	  &&  (scm_hash_table_p (tab) == SCM_BOOL_T))
+	  && (scm_hash_table_p (tab) == SCM_BOOL_T))
 	defn = scm_hashq_ref (tab, sym, SCM_EOL);
-      
-      if (Pitch * pit = unsmob_pitch (defn))
+
+      if (Pitch *pit = unsmob_pitch (defn))
 	{
-	  Audio_note* p = new Audio_note (*pit,  n->get_length (), 0);
+          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;
+            }
+
+	  Moment len = get_event_length (n, now_mom ());
+
+	  Audio_note *p = new Audio_note (*pit, len,
+                                          tie_event, Pitch (0, 0, 0));
 	  Audio_element_info info (p, n);
 	  announce_element (info);
-	  notes_.push (p);
+	  notes_.push_back (p);
 	}
     }
-  
+
   note_evs_.clear ();
 }
 
 void
 Drum_note_performer::stop_translation_timestep ()
 {
-  // why don't grace notes show up here?
-  // --> grace notes effectively do not get delayed
-  Global_context * global = get_global_context ();
-  for (int i = 0; i < notes_.size (); i++)
-    {
-      Audio_note* n = notes_[i];
-      Moment m = n->delayed_until_mom_;
-      if (m.to_bool ())
-	{
-	  global->add_moment_to_process (m);
-	  delayeds_.push (n);
-	  notes_[i] = 0;
-	  notes_.del (i);
-	  i--;
-	}
-    }
-
-  Moment now = now_mom ();
-  for (int i = 0; i < notes_.size (); i++)
-    {
-      play_element (notes_[i]);
-    }
   notes_.clear ();
   note_evs_.clear ();
-  for (int i = 0; i < delayeds_.size (); i++)
-    {
-      Audio_note* n = delayeds_[i];
-      if (n->delayed_until_mom_ <= now)
-	{
-	  play_element (n);
-	  delayeds_[i] = 0;
-	  delayeds_.del (i);
-	  i--;
-	}
-    }
 }
- 
-bool
-Drum_note_performer::try_music (Music* ev)
+
+IMPLEMENT_TRANSLATOR_LISTENER (Drum_note_performer, note);
+void
+Drum_note_performer::listen_note (Stream_event *ev)
 {
-  if (ev->is_mus_type ("note-event"))
-    {
-      note_evs_.push (ev);
-      return true;
-    }
-  else if (ev->is_mus_type ("busy-playing-event"))
-    return note_evs_.size ();
-  
-  return false;
+  note_evs_.push_back (ev);
 }
 
 ADD_TRANSLATOR (Drum_note_performer,
-		  "Play drum notes.", "",
-		  "note-event busy-playing-event", "", "", "");
+		/* doc */
+		"Play drum notes.",
 
-Drum_note_performer::Drum_note_performer ()
-{
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);