X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=ddf9fe39213e0d74910ce75a268808ad254d424c;hb=c4c2d414d41f8a83d777e3a61cb2f0e9f18c28bb;hp=3b39293e27da50f968738e430ae033c35fc468cd;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/note-performer.cc b/lily/note-performer.cc index 3b39293e27..ddf9fe3921 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -1,132 +1,143 @@ /* - 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--2012 Jan Nieuwenhuizen - (c) 1996--2002 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 "musical-request.hh" #include "audio-item.hh" #include "audio-column.hh" -#include "global-translator.hh" -#include "debug.hh" +#include "global-context.hh" +#include "stream-event.hh" +#include "warn.hh" -/** -Convert reqs to audio notes. -*/ -class Note_performer : public Performer { +#include "translator.icc" + +class Note_performer : public Performer +{ public: - TRANSLATOR_DECLARATIONS(Note_performer); - -protected: - virtual bool try_music (Music *req_l) ; + TRANSLATOR_DECLARATIONS (Note_performer); - virtual void stop_translation_timestep (); - virtual void create_audio_elements (); - Global_translator* global_translator_l (); +protected: + void stop_translation_timestep (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (note); private: - Array note_req_l_arr_; - Array note_p_arr_; - Array delayed_p_arr_; + vector note_evs_; + vector notes_; + + vector last_notes_; + Moment last_start_; + }; -void -Note_performer::create_audio_elements () +void +Note_performer::process_music () { - if (note_req_l_arr_.size ()) - { - int transposing_i = 0; - //urg - SCM prop = get_property ("transposing"); - if (gh_number_p (prop)) - transposing_i = gh_scm2int (prop); - - while (note_req_l_arr_.size ()) - { - Note_req* n = note_req_l_arr_.pop (); - Pitch pit = * unsmob_pitch (n->get_mus_property ("pitch")); - Audio_note* p = new Audio_note (pit, n->length_mom (), transposing_i); - Audio_element_info info (p, n); - announce_element (info); - note_p_arr_.push (p); - } - note_req_l_arr_.clear (); - } -} + if (!note_evs_.size ()) + return; -Global_translator* -Note_performer::global_translator_l () -{ - Translator *t = this; - Global_translator *global_l =0; - do + Pitch transposing; + SCM prop = get_property ("instrumentTransposition"); + if (unsmob_pitch (prop)) + transposing = *unsmob_pitch (prop); + + for (vsize i = 0; i < note_evs_.size (); i++) { - t = t->daddy_trans_l_ ; - global_l = dynamic_cast (t); + 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; + 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 (*pitp, len, + tie_event, transposing); + Audio_element_info info (p, n); + announce_element (info); + notes_.push_back (p); + + /* + Shorten previous 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 (); + tie_head->length_mom_ += Moment (0, now_mom ().grace_part_); + } + } + } + } } - while (!global_l); - - return global_l; } - void Note_performer::stop_translation_timestep () { - - // why don't grace notes show up here? - // --> grace notes effectively do not get delayed - Global_translator* global_l = global_translator_l (); - for (int i=0; i < note_p_arr_.size (); i++) + if (note_evs_.size ()) { - Audio_note* n = note_p_arr_[i]; - Moment m= n->delayed_until_mom_; - if (m.to_bool ()) - { - global_l->add_moment_to_process (m); - delayed_p_arr_.push (n); - note_p_arr_[i] = 0; - note_p_arr_.del (i); - i--; - } + last_notes_ = notes_; + last_start_ = now_mom (); } - Moment now = now_mom (); - for (int i=0; i < note_p_arr_.size (); i++) - { - play_element (note_p_arr_[i]); - } - note_p_arr_.clear (); - note_req_l_arr_.clear (); - for (int i=0; i < delayed_p_arr_.size (); i++) - { - Audio_note* n = delayed_p_arr_[i]; - if (n->delayed_until_mom_ <= now) - { - play_element (n); - delayed_p_arr_[i] = 0; - delayed_p_arr_.del (i); - i--; - } - } + notes_.clear (); + note_evs_.clear (); } - -bool -Note_performer::try_music (Music* req_l) + +IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note) +void +Note_performer::listen_note (Stream_event *ev) { - if (Note_req *nr = dynamic_cast (req_l)) - { - note_req_l_arr_.push (nr); - return true; - } - return false; + note_evs_.push_back (ev); } -ENTER_DESCRIPTION(Note_performer,"","","","",""); +ADD_TRANSLATOR (Note_performer, + /* doc */ + "", + + /* create */ + "", + + /* read */ + "", + + /* write */ + "" + ); -Note_performer::Note_performer() +Note_performer::Note_performer () { }