X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-performer.cc;h=44efd745742744e43afa4c7e1033503058ab9ce4;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=ff3f5b3f816a2212886c726e6a3a98c0b218e04c;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/note-performer.cc b/lily/note-performer.cc index ff3f5b3f81..44efd74574 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2011 Jan Nieuwenhuizen + Copyright (C) 1996--2015 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 @@ -35,15 +35,16 @@ protected: void stop_translation_timestep (); void process_music (); - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); + void listen_breathing (Stream_event *); + void listen_tie (Stream_event *); + void listen_articulation (Stream_event *); private: - vector note_evs_; - vector notes_; + vector note_evs_, script_evs_; + vector notes_; - - vector last_notes_; + vector last_notes_; Moment last_start_; - }; void @@ -54,51 +55,66 @@ Note_performer::process_music () Pitch transposing; SCM prop = get_property ("instrumentTransposition"); - if (unsmob_pitch (prop)) - transposing = *unsmob_pitch (prop); + if (unsmob (prop)) + transposing = *unsmob (prop); - for (vsize i = 0; i < note_evs_.size (); i ++) + 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; - 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.negated ()); - Audio_element_info info (p, n); - announce_element (info); - notes_.push_back (p); - - /* - shorten previous note. - */ - if (now_mom ().grace_part_) - { - if (last_start_.grace_part_ == Rational (0)) - { - for (vsize i = 0; i < last_notes_.size (); i++) - last_notes_[i]->length_mom_ += Moment (0, - now_mom().grace_part_); - } - } - } + if (Pitch *pitp = unsmob (pit)) + { + SCM articulations = n->get_property ("articulations"); + Stream_event *tie_event = 0; + Moment len = get_event_length (n, now_mom ()); + int velocity = 0; + + for (vsize j = script_evs_.size (); j--;) + articulations = scm_cons (script_evs_[j]->self_scm (), articulations); + + for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s)) + { + Stream_event *ev = 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); + } + + 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; + } + } + } + } } } @@ -113,29 +129,74 @@ Note_performer::stop_translation_timestep () notes_.clear (); note_evs_.clear (); + script_evs_.clear (); } -IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note) void Note_performer::listen_note (Stream_event *ev) { note_evs_.push_back (ev); } +void +Note_performer::listen_tie (Stream_event *ev) +{ + script_evs_.push_back (ev); +} + +void +Note_performer::listen_articulation (Stream_event *ev) +{ + script_evs_.push_back (ev); +} + +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; + } +} + +void +Note_performer::boot () +{ + ADD_LISTENER (Note_performer, note); + ADD_LISTENER (Note_performer, breathing); + ADD_LISTENER (Note_performer, tie); + ADD_LISTENER (Note_performer, articulation); +} + ADD_TRANSLATOR (Note_performer, - /* doc */ - "", + /* doc */ + "", - /* create */ - "", + /* create */ + "", - /* read */ - "", + /* read */ + "", - /* write */ - "" - ); + /* write */ + "" + ); -Note_performer::Note_performer () +Note_performer::Note_performer (Context *c) + : Performer (c) { }