X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=44a624313b803c8900097ad6dd271b9b5d91b29a;hb=f4abbfff5f0d985a457e15586dbcc3ae473b0dee;hp=cda5f12d674d871d900a0d90e22106241f1a2b58;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index cda5f12d67..44a624313b 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2014 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
@@ -35,8 +35,7 @@ protected:
   void process_music ();
   DECLARE_TRANSLATOR_LISTENER (note);
 private:
-  vector<Stream_event*> note_evs_;
-  vector<Audio_note*> notes_;
+  vector<Stream_event *> note_evs_;
 };
 
 Drum_note_performer::Drum_note_performer ()
@@ -56,33 +55,36 @@ Drum_note_performer::process_music ()
       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);
+          && (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 = Pitch::unsmob (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))
+          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 = unsmob_stream_event (scm_car (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);
             }
 
-	  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_back (p);
-	}
+          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 ();
@@ -91,7 +93,6 @@ Drum_note_performer::process_music ()
 void
 Drum_note_performer::stop_translation_timestep ()
 {
-  notes_.clear ();
   note_evs_.clear ();
 }
 
@@ -103,15 +104,15 @@ Drum_note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Drum_note_performer,
-		/* doc */
-		"Play drum notes.",
+                /* doc */
+                "Play drum notes.",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );