X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=77fb9e336df5c90c70f2a30e67379d30ed642b92;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=560d89bde29191b941c3b6f0ebb9ca8aa228ec0a;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 560d89bde2..77fb9e336d 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -1,32 +1,57 @@ -/* - tie-performer.cc -- implement Tie_performer - - source file of the GNU LilyPond music typesetter - - (c) 1998--2005 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2014 Han-Wen Nienhuys + + 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 "context.hh" -#include "audio-item.hh" -#include "pqueue.hh" #include "performer.hh" +#include "audio-item.hh" +#include "context.hh" +#include "stream-event.hh" +#include "translator.icc" +#include + +struct Head_audio_event_tuple +{ + Audio_element_info head_; + // The end moment of the note, so we can calculate a skip and check whether + // the note still goes on + Moment end_moment_; + Head_audio_event_tuple () {} + Head_audio_event_tuple (Audio_element_info h, Moment m) + { + head_ = h; + end_moment_ = m; + } +}; + class Tie_performer : public Performer { - Music *event_; - Music *last_event_; - Array now_heads_; - Array heads_to_tie_; + Stream_event *event_; + list now_heads_; + list now_tied_heads_; // new tied notes + list heads_to_tie_; // heads waiting for closing tie - bool ties_created_; - protected: - virtual void stop_translation_timestep (); - virtual void start_translation_timestep (); + void stop_translation_timestep (); + void start_translation_timestep (); virtual void acknowledge_audio_element (Audio_element_info); - virtual bool try_music (Music*); - virtual void process_music (); + void process_music (); + DECLARE_TRANSLATOR_LISTENER (tie); public: TRANSLATOR_DECLARATIONS (Tie_performer); }; @@ -34,19 +59,13 @@ public: Tie_performer::Tie_performer () { event_ = 0; - last_event_ = 0; - ties_created_ = false; } -bool -Tie_performer::try_music (Music *mus) +IMPLEMENT_TRANSLATOR_LISTENER (Tie_performer, tie); +void +Tie_performer::listen_tie (Stream_event *ev) { - if (mus->is_mus_type ("tie-event")) - { - event_ = mus; - } - - return true; + event_ = ev; } void @@ -59,24 +78,41 @@ Tie_performer::process_music () void Tie_performer::acknowledge_audio_element (Audio_element_info inf) { - if (Audio_note * an = dynamic_cast (inf.elem_)) + if (Audio_note *an = dynamic_cast (inf.elem_)) { - now_heads_.push (inf); - for (int i = heads_to_tie_.size (); i--;) - { - Music * right_mus = inf.event_; - - Audio_note *th = dynamic_cast (heads_to_tie_[i].elem_); - Music * left_mus = heads_to_tie_[i].event_; - - if (right_mus && left_mus - && ly_c_equal_p (right_mus->get_property ("pitch"), - left_mus->get_property ("pitch"))) - { - an->tie_to (th); - ties_created_ = true; - } - } + // for each tied note, store the info and its end moment, so we can + // later on check whether (1) the note is still ongoing and (2) how + // long the skip is with tieWaitForNote + Head_audio_event_tuple inf_mom (inf, now_mom () + an->length_mom_); + if (an->tie_event_) + now_tied_heads_.push_back (inf_mom); + else + now_heads_.push_back (inf_mom); + + // Find a previous note that ties to the current note. If it exists, + // remove it from the heads_to_tie vector and create the tie + list::iterator it; + bool found = false; + Stream_event *right_mus = inf.event_; + for (it = heads_to_tie_.begin (); + !found && (it != heads_to_tie_.end ()); + it++) + { + Audio_element_info et = (*it).head_; + Audio_note *th = dynamic_cast (et.elem_); + Stream_event *left_mus = et.event_; + + if (th && right_mus && left_mus + && ly_is_equal (right_mus->get_property ("pitch"), + left_mus->get_property ("pitch"))) + { + found = true; + // (*it).moment_ already stores the end of the tied note! + Moment skip = now_mom () - (*it).end_moment_; + an->tie_to (th, skip); + it = heads_to_tie_.erase (it); + } + } } } @@ -84,33 +120,55 @@ void Tie_performer::start_translation_timestep () { context ()->set_property ("tieMelismaBusy", - ly_bool2scm (heads_to_tie_.size ())); - + ly_bool2scm (heads_to_tie_.size ())); } +// a predicate implemented as a class, used to delete all tied notes with end +// moment in the past: +class end_moment_passed +{ +protected: + Moment now; +public: + end_moment_passed (Moment mom) : now (mom) {} + bool operator () (const Head_audio_event_tuple &value) + { + return (value.end_moment_ <= now); + } +}; + void Tie_performer::stop_translation_timestep () { - if (ties_created_) + // We might have dangling open ties like c~ d. Close them, unless the first + // note is still ongoing or we have we have tieWaitForNote set... + if (!to_boolean (get_property ("tieWaitForNote"))) { - heads_to_tie_.clear (); - last_event_ = 0; - ties_created_ = false; + heads_to_tie_.remove_if (end_moment_passed (now_mom ())); } - + + // Append now_heads_ and now_tied_heads to heads_to_tie_ for the next time step if (event_) { - heads_to_tie_ = now_heads_; - last_event_ = event_; + heads_to_tie_.splice (heads_to_tie_.end (), now_heads_); } + heads_to_tie_.splice (heads_to_tie_.end (), now_tied_heads_); + event_ = 0; now_heads_.clear (); + now_tied_heads_.clear (); } ADD_TRANSLATOR (Tie_performer, -/* descr */ "Generate ties between noteheads of equal pitch.", -/* creats*/ "", -/* accepts */ "tie-event", -/* acks */ "", -/* reads */ "tieMelismaBusy", -/* write */ ""); + /* doc */ + "Generate ties between note heads of equal pitch.", + + /* create */ + "", + + /* read */ + "tieWaitForNote", + + /* write */ + "tieMelismaBusy" + );