X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=a29b7a1dee7986a512317066d44f61c7e603fd92;hb=10ac84f21313e8cc86540d1c8137cb96020b98b3;hp=50b8c3f9774b4892febb4eff48bdfed2b8de2a1c;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 50b8c3f977..a29b7a1dee 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -3,55 +3,61 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
 #include "warn.hh"
+#include "pitch.hh"
+#include "music.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 ();
+  virtual bool try_music (Music *ev);
+  void stop_translation_timestep ();
+  void process_music ();
+
 private:
-  Link_array<Music> note_evs_;
-  Link_array<Audio_note> notes_;
-  Link_array<Audio_note> delayeds_;
+  vector<Music*> note_evs_;
+  vector<Audio_note*> notes_;
 };
 
-void 
-Drum_note_performer::create_audio_elements ()
+Drum_note_performer::Drum_note_performer ()
+{
+}
+
+void
+Drum_note_performer::process_music ()
 {
-  SCM tab =0;
-  if (!tab) tab = get_property ("drumPitchTable");
-  
+  SCM tab = get_property ("drumPitchTable");
+
   while (note_evs_.size ())
     {
-      Music* n = note_evs_.pop ();
+      Music *n = note_evs_.back ();
+      note_evs_.pop_back ();
       SCM sym = n->get_property ("drum-type");
       SCM defn = SCM_EOL;
 
-      if (ly_symbol_p (sym)
-	  &&  (scm_hash_table_p (tab) == SCM_BOOL_T))
+      if (scm_is_symbol (sym)
+	  && (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);
+	  Audio_note *p = new Audio_note (*pit, n->get_length (), 0);
 	  Audio_element_info info (p, n);
 	  announce_element (info);
-	  notes_.push (p);
+	  notes_.push_back (p);
 	}
     }
-  
+
   note_evs_.clear ();
 }
 
@@ -60,59 +66,29 @@ 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]);
-    }
+  for (vsize 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)
+Drum_note_performer::try_music (Music *ev)
 {
   if (ev->is_mus_type ("note-event"))
     {
-      note_evs_.push (ev);
+      note_evs_.push_back (ev);
       return true;
     }
   else if (ev->is_mus_type ("busy-playing-event"))
     return note_evs_.size ();
-  
+
   return false;
 }
 
-ENTER_DESCRIPTION (Drum_note_performer,
-		  "Play drum notes.","",
-		  "note-event busy-playing-event","","","");
+#include "translator.icc"
 
-Drum_note_performer::Drum_note_performer ()
-{
-}
+ADD_TRANSLATOR (Drum_note_performer,
+		"Play drum notes.", "",
+		"note-event busy-playing-event", "", "");