X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=771b52a9e0e131a2432311f5bb85f151bb553451;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=f19f8c704dc5d65d4410658bb020e84dcfe6a5b2;hpb=7f6816438d66f6d70db5b68454d80656a0f3f131;p=lilypond.git diff --git a/lily/note-performer.cc b/lily/note-performer.cc index f19f8c704d..771b52a9e0 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -1,98 +1,171 @@ /* - note-performer.cc -- implement Note_performer + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1996--2014 Jan Nieuwenhuizen - (c) 1996--2005 Jan Nieuwenhuizen + 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 . */ #include "performer.hh" #include "audio-item.hh" #include "audio-column.hh" #include "global-context.hh" +#include "stream-event.hh" #include "warn.hh" -#include "music.hh" -/** - Convert evs to audio notes. -*/ +#include "translator.icc" + class Note_performer : public Performer { public: TRANSLATOR_DECLARATIONS (Note_performer); protected: - virtual bool try_music (Music *ev); - void stop_translation_timestep (); - virtual void create_audio_elements (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (breathing); private: - Link_array note_evs_; - Link_array notes_; + vector note_evs_; + vector notes_; + + vector last_notes_; + Moment last_start_; + }; void -Note_performer::create_audio_elements () +Note_performer::process_music () { - if (note_evs_.size ()) + if (!note_evs_.size ()) + return; + + Pitch transposing; + SCM prop = get_property ("instrumentTransposition"); + if (unsmob_pitch (prop)) + transposing = *unsmob_pitch (prop); + + for (vsize i = 0; i < note_evs_.size (); i++) { - int transposing = 0; - - SCM prop = get_property ("instrumentTransposition"); - if (unsmob_pitch (prop)) - transposing = unsmob_pitch (prop)->semitone_pitch (); - - while (note_evs_.size ()) - { - Music *n = note_evs_.pop (); - SCM pit = n->get_property ("pitch"); - - if (Pitch *pitp = unsmob_pitch (pit)) - { - Audio_note *p = new Audio_note (*pitp, n->get_length (), - transposing); - Audio_element_info info (p, n); - announce_element (info); - notes_.push (p); - } - } - note_evs_.clear (); + Stream_event *n = note_evs_[i]; + SCM pit = n->get_property ("pitch"); + + if (Pitch *pitp = unsmob_pitch (pit)) + { + 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 = unsmob_stream_event (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 (*pitp, len, + tie_event, transposing, velocity); + Audio_element_info info (p, n); + announce_element (info); + notes_.push_back (p); + + /* + Grace notes shorten the previous non-grace note. If it was + part of a tie, shorten the first note in the tie. + */ + if (now_mom ().grace_part_) + { + if (last_start_.grace_part_ == Rational (0)) + { + for (vsize i = 0; i < last_notes_.size (); i++) + { + Audio_note *tie_head = last_notes_[i]->tie_head (); + Moment start = tie_head->audio_column_->when (); + //Shorten the note if it would overlap. It might + //not if there's a rest in between. + if (start + tie_head->length_mom_ > now_mom ()) + tie_head->length_mom_ = now_mom () - start; + } + } + } + } } } void 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 (int i = 0; i < notes_.size (); i++) + if (note_evs_.size ()) { - play_element (notes_[i]); + last_notes_ = notes_; + last_start_ = now_mom (); } + notes_.clear (); note_evs_.clear (); } -bool -Note_performer::try_music (Music *ev) +IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note) +void +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 (); + note_evs_.push_back (ev); +} - return false; +IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, breathing) +void +Note_performer::listen_breathing (Stream_event *ev) +{ + //Shorten previous note if needed + SCM f = ev->get_property ("midi-length"); + if (ly_is_procedure (f)) + for (vsize i = 0; i < last_notes_.size (); i++) + { + Audio_note *tie_head = last_notes_[i]->tie_head (); + //Give midi-length the available time since the note started, + //including rests. It returns how much is left for the note. + Moment available = now_mom () - tie_head->audio_column_->when (); + Moment len = robust_scm2moment (scm_call_2 (f, available.smobbed_copy (), + context ()->self_scm ()), available); + if (len < tie_head->length_mom_) + tie_head->length_mom_ = len; + } } -#include "translator.icc" +ADD_TRANSLATOR (Note_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", -ADD_TRANSLATOR (Note_performer, "", "", - "note-event busy-playing-event", - "", ""); + /* write */ + "" + ); Note_performer::Note_performer () {