X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdrum-note-performer.cc;h=959d39eb9d01bca5877aecc2cb1afce034c12358;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=112ad6972c8ad872d149268629b0f8945a26cc8d;hpb=eb51e9b3adf374a806fed1dda25d146974950123;p=lilypond.git diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc index 112ad6972c..959d39eb9d 100644 --- a/lily/drum-note-performer.cc +++ b/lily/drum-note-performer.cc @@ -3,14 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2006 Jan Nieuwenhuizen + (c) 1996--2008 Jan Nieuwenhuizen */ #include "performer.hh" #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" @@ -51,7 +50,24 @@ Drum_note_performer::process_music () if (Pitch *pit = unsmob_pitch (defn)) { - Audio_note *p = new Audio_note (*pit, get_event_length (n), 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_back (p); @@ -64,11 +80,6 @@ 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 (); } @@ -81,5 +92,15 @@ Drum_note_performer::listen_note (Stream_event *ev) } ADD_TRANSLATOR (Drum_note_performer, - "Play drum notes.", "", - "note-event", "", ""); + /* doc */ + "Play drum notes.", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + );