X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=6c565cd8e050623b31ef925b408a1422058314d4;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3bb56ccabaf0d0c6f8d80ef6933314bf456083ba;hpb=afc519eae4c31fe515371ec68b077d6532a7e5cf;p=lilypond.git

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index 3bb56ccaba..6c565cd8e0 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -1,118 +1,118 @@
 /*
-  note-performer.cc -- implement Drum_note_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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_;
 };
 
-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 ();
+      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))
-	defn = scm_hashq_ref (tab, sym, SCM_EOL);
-      
-      if (Pitch * pit = unsmob_pitch (defn))
-	{
-	  Audio_note* p = new Audio_note (*pit,  n->get_length (), 0);
-	  Audio_element_info info (p, n);
-	  announce_element (info);
-	  notes_.push (p);
-	}
+          && (scm_hash_table_p (tab) == SCM_BOOL_T))
+        defn = scm_hashq_ref (tab, sym, SCM_EOL);
+
+      if (Pitch *pit = Pitch::unsmob (defn))
+        {
+          SCM articulations = n->get_property ("articulations");
+          Stream_event *tie_event = 0;
+          Moment len = get_event_length (n, now_mom ());
+          int velocity = 0;
+          for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
+            {
+              Stream_event *ev = Stream_event::unsmob (scm_car (s));
+              if (!ev)
+                continue;
+
+              if (ev->in_event_class ("tie-event"))
+                tie_event = ev;
+              SCM f = ev->get_property ("midi-length");
+              if (ly_is_procedure (f))
+                len = robust_scm2moment (scm_call_2 (f, len.smobbed_copy (),
+                                                     context ()->self_scm ()),
+                                         len);
+              velocity += robust_scm2int (ev->get_property ("midi-extra-velocity"), 0);
+            }
+
+          Audio_note *p = new Audio_note (*pit, len,
+                                          tie_event, Pitch (0, 0), velocity);
+          Audio_element_info info (p, n);
+          announce_element (info);
+        }
     }
-  
+
   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 */
+                ""
+               );