X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=88b0e48a4ea2e2253a91678f27e3f66bbcb76df3;hb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;hp=e9e5dd5ca77f1d53e22aa879a6e540b634f46147;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git diff --git a/lily/note-performer.cc b/lily/note-performer.cc index e9e5dd5ca7..59ac69ac98 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -1,57 +1,176 @@ /* - 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, 1997 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. -#include "note-performer.hh" -#include "translator.hh" -#include "input-translator.hh" -#include "musical-request.hh" + 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 "debug.hh" +#include "audio-column.hh" +#include "global-context.hh" +#include "stream-event.hh" +#include "warn.hh" + +#include "translator.icc" + +class Note_performer : public Performer +{ +public: + TRANSLATOR_DECLARATIONS (Note_performer); + +protected: + void stop_translation_timestep (); + void process_music (); -IMPLEMENT_IS_TYPE_B1(Note_performer,Performer); + DECLARE_TRANSLATOR_LISTENER (note); + DECLARE_TRANSLATOR_LISTENER (breathing); +private: + vector note_evs_; + vector notes_; -ADD_THIS_PERFORMER(Note_performer); + vector last_notes_; + Moment last_start_; -Note_performer::Note_performer() +}; + +void +Note_performer::process_music () { - note_req_l_ = 0; + 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++) + { + 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::do_print() const +void +Note_performer::stop_translation_timestep () { -#ifndef NPRINT - if ( note_req_l_) { - note_req_l_->print(); + if (note_evs_.size ()) + { + last_notes_ = notes_; + last_start_ = now_mom (); } -#endif + + notes_.clear (); + note_evs_.clear (); } -void -Note_performer::process_requests() +IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note) +void +Note_performer::listen_note (Stream_event *ev) { - // this is _really_ braindead, but it generates some output - if ( !note_req_l_ || !note_req_l_->melodic() || !note_req_l_->rhythmic ()) - return; + note_evs_.push_back (ev); +} - play (new Audio_note (note_req_l_) ); - note_req_l_ = 0; +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++) + { + //Pass midi-length the available time since the last note started, + //including any intervening rests. It returns how much is left for the + //note. + Moment start = last_notes_[i]->audio_column_->when (); + Moment available = now_mom () - start; + Moment len = robust_scm2moment (scm_call_2 (f, available.smobbed_copy (), + context ()->self_scm ()), available); + //Take time from the first note of the tie, since it has all the length. + Audio_note *tie_head = last_notes_[i]->tie_head (); + len += start - tie_head->audio_column_->when (); + if (len < tie_head->length_mom_) + tie_head->length_mom_ = len; + } } -bool -Note_performer::do_try_request (Request* req_l) +ADD_TRANSLATOR (Note_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + ); + +Note_performer::Note_performer () { - if ( note_req_l_) - return false; - - if ( !req_l->musical() || !req_l->musical ()->note ()) - return false; - - note_req_l_ = req_l->musical()->melodic (); - return true; }